[Commits] r2751 - in sandbox/gxm/geoext/gxm: examples lib tests/lib tests/lib/data tests/lib/data/model
commits at geoext.org
commits at geoext.org
Wed Jul 20 14:37:41 CEST 2011
Author: marcjansen
Date: 2011-07-20 14:37:41 +0200 (Wed, 20 Jul 2011)
New Revision: 2751
Added:
sandbox/gxm/geoext/gxm/lib/GXM.loader.js
Removed:
sandbox/gxm/geoext/gxm/lib/GXM.js
Modified:
sandbox/gxm/geoext/gxm/examples/buttons.html
sandbox/gxm/geoext/gxm/examples/layerlist.html
sandbox/gxm/geoext/gxm/examples/mappanel.html
sandbox/gxm/geoext/gxm/examples/state.html
sandbox/gxm/geoext/gxm/tests/lib/Button.test.html
sandbox/gxm/geoext/gxm/tests/lib/GXM.test.html
sandbox/gxm/geoext/gxm/tests/lib/LayerList.test.html
sandbox/gxm/geoext/gxm/tests/lib/MapPanel.test.html
sandbox/gxm/geoext/gxm/tests/lib/SegmentedButton.test.html
sandbox/gxm/geoext/gxm/tests/lib/data/LayerReader.test.html
sandbox/gxm/geoext/gxm/tests/lib/data/LayerStore.test.html
sandbox/gxm/geoext/gxm/tests/lib/data/model/Layer.test.html
Log:
rename the loader file for GXM to 'GXM.loader.js' to avoid possible future irritations
Modified: sandbox/gxm/geoext/gxm/examples/buttons.html
===================================================================
--- sandbox/gxm/geoext/gxm/examples/buttons.html 2011-07-20 12:25:03 UTC (rev 2750)
+++ sandbox/gxm/geoext/gxm/examples/buttons.html 2011-07-20 12:37:41 UTC (rev 2751)
@@ -17,7 +17,7 @@
<script type="text/javascript" src="../external/OpenLayers.r11966/OpenLayers.js"></script>
<!-- This file loads all relevant files -->
- <script type="text/javascript" src="../lib/GXM.js"></script>
+ <script type="text/javascript" src="../lib/GXM.loader.js"></script>
<script type="text/javascript" src="./buttons.js"></script>
</head>
Modified: sandbox/gxm/geoext/gxm/examples/layerlist.html
===================================================================
--- sandbox/gxm/geoext/gxm/examples/layerlist.html 2011-07-20 12:25:03 UTC (rev 2750)
+++ sandbox/gxm/geoext/gxm/examples/layerlist.html 2011-07-20 12:37:41 UTC (rev 2751)
@@ -19,7 +19,7 @@
<script type="text/javascript" src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>
<!-- This file loads all relevant files -->
- <script type="text/javascript" src="../lib/GXM.js"></script>
+ <script type="text/javascript" src="../lib/GXM.loader.js"></script>
<script type="text/javascript" src="./layerlist.js"></script>
</head>
Modified: sandbox/gxm/geoext/gxm/examples/mappanel.html
===================================================================
--- sandbox/gxm/geoext/gxm/examples/mappanel.html 2011-07-20 12:25:03 UTC (rev 2750)
+++ sandbox/gxm/geoext/gxm/examples/mappanel.html 2011-07-20 12:37:41 UTC (rev 2751)
@@ -17,7 +17,7 @@
<script type="text/javascript" src="../external/OpenLayers.r11966/OpenLayers.js"></script>
<!-- This file loads all relevant files -->
- <script type="text/javascript" src="../lib/GXM.js"></script>
+ <script type="text/javascript" src="../lib/GXM.loader.js"></script>
<script type="text/javascript" src="./mappanel.js"></script>
</head>
Modified: sandbox/gxm/geoext/gxm/examples/state.html
===================================================================
--- sandbox/gxm/geoext/gxm/examples/state.html 2011-07-20 12:25:03 UTC (rev 2750)
+++ sandbox/gxm/geoext/gxm/examples/state.html 2011-07-20 12:37:41 UTC (rev 2751)
@@ -17,7 +17,7 @@
<script type="text/javascript" src="../external/OpenLayers.r11966/OpenLayers.js"></script>
<!-- This file loads all relevant files -->
- <script type="text/javascript" src="../lib/GXM.js"></script>
+ <script type="text/javascript" src="../lib/GXM.loader.js"></script>
<script type="text/javascript" src="./state.js"></script>
</head>
Deleted: sandbox/gxm/geoext/gxm/lib/GXM.js
===================================================================
--- sandbox/gxm/geoext/gxm/lib/GXM.js 2011-07-20 12:25:03 UTC (rev 2750)
+++ sandbox/gxm/geoext/gxm/lib/GXM.js 2011-07-20 12:37:41 UTC (rev 2751)
@@ -1,76 +0,0 @@
-Ext.ns('GXM');
-
-
-(function(){
-
- /**
- * Check to see if GeoExt.singleFile is true. It is true if the
- * GXM/SingleFile.js is included before this one, as it is
- * the case in single file builds.
- */
- var singleFile = (Ext.isObject(GXM) && GXM.singleFile);
-
- window.GXM = Ext.apply(GXM || {}, {version:'1.0.0'});
-
- /**
- * The relative path of this script.
- */
- var scriptName = singleFile ? "GXM.js" : "lib/GXM.js";
-
- /**
- * Function returning the path of this script.
- */
- var getScriptLocation = function() {
- var scriptLocation = "";
- // If we load other scripts right before GXM using the same
- // mechanism to add script resources dynamically (e.g. OpenLayers),
- // document.getElementsByTagName will not find the GeoExt script tag
- // in FF2. Using document.documentElement.getElementsByTagName instead
- // works around this issue.
- var scripts = document.documentElement.getElementsByTagName('script');
- for(var i=0, len=scripts.length; i<len; i++) {
- var src = scripts[i].getAttribute('src');
- if(src) {
- var index = src.lastIndexOf(scriptName);
- // set path length for src up to a query string
- var pathLength = src.lastIndexOf('?');
- if(pathLength < 0) {
- pathLength = src.length;
- }
- // is it found, at the end of the URL?
- if((index > -1) && (index + scriptName.length == pathLength)) {
- scriptLocation = src.slice(0, pathLength - scriptName.length);
- break;
- }
- }
- }
- return scriptLocation;
- };
-
- /**
- * If GXM.singleFile is false then the JavaScript files in the jsfiles
- * array are autoloaded.
- */
- if(!singleFile) {
- var jsfiles = [
- "MapPanel.js",
- "Button.js",
- "SegmentedButton.js",
- "data/model/Layer.js",
- "data/LayerReader.js",
- "data/LayerStore.js",
- "LayerList.js"
- ];
-
- var len = jsfiles.length;
- var allScriptTags = [];
- var host = getScriptLocation() + "lib/";
-
- Ext.each(jsfiles, function(jsfile) {
- allScriptTags.push( "<script src='" + host + jsfile +"'></script>" );
- });
-
- document.write(allScriptTags.join(""));
- }
-
-})();
Copied: sandbox/gxm/geoext/gxm/lib/GXM.loader.js (from rev 2749, sandbox/gxm/geoext/gxm/lib/GXM.js)
===================================================================
--- sandbox/gxm/geoext/gxm/lib/GXM.loader.js (rev 0)
+++ sandbox/gxm/geoext/gxm/lib/GXM.loader.js 2011-07-20 12:37:41 UTC (rev 2751)
@@ -0,0 +1,75 @@
+Ext.ns('GXM');
+
+(function(){
+
+ /**
+ * Check to see if GeoExt.singleFile is true. It is true if the
+ * GXM/SingleFile.js is included before this one, as it is
+ * the case in single file builds.
+ */
+ var singleFile = (Ext.isObject(GXM) && GXM.singleFile);
+
+ window.GXM = Ext.apply(GXM || {}, {version:'1.0.0'});
+
+ /**
+ * The relative path of this script.
+ */
+ var scriptName = singleFile ? "GXM.js" : "lib/GXM.loader.js";
+
+ /**
+ * Function returning the path of this script.
+ */
+ var getScriptLocation = function() {
+ var scriptLocation = "";
+ // If we load other scripts right before GXM using the same
+ // mechanism to add script resources dynamically (e.g. OpenLayers),
+ // document.getElementsByTagName will not find the GeoExt script tag
+ // in FF2. Using document.documentElement.getElementsByTagName instead
+ // works around this issue.
+ var scripts = document.documentElement.getElementsByTagName('script');
+ for(var i=0, len=scripts.length; i<len; i++) {
+ var src = scripts[i].getAttribute('src');
+ if(src) {
+ var index = src.lastIndexOf(scriptName);
+ // set path length for src up to a query string
+ var pathLength = src.lastIndexOf('?');
+ if(pathLength < 0) {
+ pathLength = src.length;
+ }
+ // is it found, at the end of the URL?
+ if((index > -1) && (index + scriptName.length == pathLength)) {
+ scriptLocation = src.slice(0, pathLength - scriptName.length);
+ break;
+ }
+ }
+ }
+ return scriptLocation;
+ };
+
+ /**
+ * If GXM.singleFile is false then the JavaScript files in the jsfiles
+ * array are autoloaded.
+ */
+ if(!singleFile) {
+ var jsfiles = [
+ "MapPanel.js",
+ "Button.js",
+ "SegmentedButton.js",
+ "data/model/Layer.js",
+ "data/LayerReader.js",
+ "data/LayerStore.js",
+ "LayerList.js"
+ ];
+
+ var len = jsfiles.length;
+ var allScriptTags = [];
+ var host = getScriptLocation() + "lib/";
+
+ Ext.each(jsfiles, function(jsfile) {
+ allScriptTags.push( "<script src='" + host + jsfile +"'></script>" );
+ });
+
+ document.write(allScriptTags.join(""));
+ }
+
+})();
Modified: sandbox/gxm/geoext/gxm/tests/lib/Button.test.html
===================================================================
--- sandbox/gxm/geoext/gxm/tests/lib/Button.test.html 2011-07-20 12:25:03 UTC (rev 2750)
+++ sandbox/gxm/geoext/gxm/tests/lib/Button.test.html 2011-07-20 12:37:41 UTC (rev 2751)
@@ -10,7 +10,7 @@
<script type="text/javascript" src="../../external/OpenLayers.r11966/lib/OpenLayers.js?mobile"></script>
<!-- This file loads all relevant files -->
- <script type="text/javascript" src="../../lib/GXM.js"></script>
+ <script type="text/javascript" src="../../lib/GXM.loader.js"></script>
<!-- load test helper functions -->
<script type="text/javascript" src="../helperfunctions.js"></script>
Modified: sandbox/gxm/geoext/gxm/tests/lib/GXM.test.html
===================================================================
--- sandbox/gxm/geoext/gxm/tests/lib/GXM.test.html 2011-07-20 12:25:03 UTC (rev 2750)
+++ sandbox/gxm/geoext/gxm/tests/lib/GXM.test.html 2011-07-20 12:37:41 UTC (rev 2751)
@@ -10,7 +10,7 @@
<script type="text/javascript" src="../../external/OpenLayers.r11966/lib/OpenLayers.js?mobile"></script>
<!-- This file loads all relevant files -->
- <script type="text/javascript" src="../../lib/GXM.js"></script>
+ <script type="text/javascript" src="../../lib/GXM.loader.js"></script>
<script type="text/javascript">
Modified: sandbox/gxm/geoext/gxm/tests/lib/LayerList.test.html
===================================================================
--- sandbox/gxm/geoext/gxm/tests/lib/LayerList.test.html 2011-07-20 12:25:03 UTC (rev 2750)
+++ sandbox/gxm/geoext/gxm/tests/lib/LayerList.test.html 2011-07-20 12:37:41 UTC (rev 2751)
@@ -10,7 +10,7 @@
<script type="text/javascript" src="../../external/OpenLayers.r11966/lib/OpenLayers.js?mobile"></script>
<!-- This file loads all relevant files -->
- <script type="text/javascript" src="../../lib/GXM.js"></script>
+ <script type="text/javascript" src="../../lib/GXM.loader.js"></script>
<!-- load test helper functions -->
<script type="text/javascript" src="../helperfunctions.js"></script>
Modified: sandbox/gxm/geoext/gxm/tests/lib/MapPanel.test.html
===================================================================
--- sandbox/gxm/geoext/gxm/tests/lib/MapPanel.test.html 2011-07-20 12:25:03 UTC (rev 2750)
+++ sandbox/gxm/geoext/gxm/tests/lib/MapPanel.test.html 2011-07-20 12:37:41 UTC (rev 2751)
@@ -10,7 +10,7 @@
<script type="text/javascript" src="../../external/OpenLayers.r11966/lib/OpenLayers.js?mobile"></script>
<!-- This file loads all relevant files -->
- <script type="text/javascript" src="../../lib/GXM.js"></script>
+ <script type="text/javascript" src="../../lib/GXM.loader.js"></script>
<!-- load test helper functions -->
<script type="text/javascript" src="../helperfunctions.js"></script>
Modified: sandbox/gxm/geoext/gxm/tests/lib/SegmentedButton.test.html
===================================================================
--- sandbox/gxm/geoext/gxm/tests/lib/SegmentedButton.test.html 2011-07-20 12:25:03 UTC (rev 2750)
+++ sandbox/gxm/geoext/gxm/tests/lib/SegmentedButton.test.html 2011-07-20 12:37:41 UTC (rev 2751)
@@ -10,7 +10,7 @@
<script type="text/javascript" src="../../external/OpenLayers.r11966/lib/OpenLayers.js?mobile"></script>
<!-- This file loads all relevant files -->
- <script type="text/javascript" src="../../lib/GXM.js"></script>
+ <script type="text/javascript" src="../../lib/GXM.loader.js"></script>
<script type="text/javascript">
Modified: sandbox/gxm/geoext/gxm/tests/lib/data/LayerReader.test.html
===================================================================
--- sandbox/gxm/geoext/gxm/tests/lib/data/LayerReader.test.html 2011-07-20 12:25:03 UTC (rev 2750)
+++ sandbox/gxm/geoext/gxm/tests/lib/data/LayerReader.test.html 2011-07-20 12:37:41 UTC (rev 2751)
@@ -10,7 +10,7 @@
<script type="text/javascript" src="../../../external/OpenLayers.r11966/lib/OpenLayers.js?mobile"></script>
<!-- This file loads all relevant files -->
- <script type="text/javascript" src="../../../lib/GXM.js"></script>
+ <script type="text/javascript" src="../../../lib/GXM.loader.js"></script>
<script type="text/javascript">
Modified: sandbox/gxm/geoext/gxm/tests/lib/data/LayerStore.test.html
===================================================================
--- sandbox/gxm/geoext/gxm/tests/lib/data/LayerStore.test.html 2011-07-20 12:25:03 UTC (rev 2750)
+++ sandbox/gxm/geoext/gxm/tests/lib/data/LayerStore.test.html 2011-07-20 12:37:41 UTC (rev 2751)
@@ -10,7 +10,7 @@
<script type="text/javascript" src="../../../external/OpenLayers.r11966/lib/OpenLayers.js?mobile"></script>
<!-- This file loads all relevant files -->
- <script type="text/javascript" src="../../../lib/GXM.js"></script>
+ <script type="text/javascript" src="../../../lib/GXM.loader.js"></script>
<script type="text/javascript">
Modified: sandbox/gxm/geoext/gxm/tests/lib/data/model/Layer.test.html
===================================================================
--- sandbox/gxm/geoext/gxm/tests/lib/data/model/Layer.test.html 2011-07-20 12:25:03 UTC (rev 2750)
+++ sandbox/gxm/geoext/gxm/tests/lib/data/model/Layer.test.html 2011-07-20 12:37:41 UTC (rev 2751)
@@ -10,7 +10,7 @@
<script type="text/javascript" src="../../../../external/OpenLayers.r11966/lib/OpenLayers.js?mobile"></script>
<!-- This file loads all relevant files -->
- <script type="text/javascript" src="../../../../lib/GXM.js"></script>
+ <script type="text/javascript" src="../../../../lib/GXM.loader.js"></script>
<script type="text/javascript">
More information about the Commits
mailing list