[Commits] r2641 - in sandbox: mapgears/geoext.ux/ux/LayerTreeBuilder/lib/GeoExt.ux mapgears/geoext.ux/ux/WFSTFeatureEditing/lib/GeoExt.ux mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux mapgears/geoext.ux/ux/ZoomTo/lib/GeoExt.ux redlining/ux/FeatureEditing/ux
commits at geoext.org
commits at geoext.org
Thu Mar 31 22:34:56 CEST 2011
Author: edube
Date: 2011-03-31 22:34:56 +0200 (Thu, 31 Mar 2011)
New Revision: 2641
Modified:
sandbox/mapgears/geoext.ux/ux/LayerTreeBuilder/lib/GeoExt.ux/LayerTreeBuilder.js
sandbox/mapgears/geoext.ux/ux/WFSTFeatureEditing/lib/GeoExt.ux/WFSTFeatureEditing.js
sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/WMSBrowser.js
sandbox/mapgears/geoext.ux/ux/ZoomTo/lib/GeoExt.ux/SingleFile.js
sandbox/redlining/ux/FeatureEditing/ux/FeatureEditing.js
Log:
Fix script loader for Firefox 4 (as per http://trac.geoext.org/ticket/414) for the following ux:
mapgears/geoext.ux/ux/LayerTreeBuilder
mapgears/geoext.ux/ux/WFSTFeatureEditing
mapgears/geoext.ux/ux/WMSBrowser
mapgears/geoext.ux/ux/ZoomTo
geoext-sandbox/redlining/ux/FeatureEditing
Modified: sandbox/mapgears/geoext.ux/ux/LayerTreeBuilder/lib/GeoExt.ux/LayerTreeBuilder.js
===================================================================
--- sandbox/mapgears/geoext.ux/ux/LayerTreeBuilder/lib/GeoExt.ux/LayerTreeBuilder.js 2011-03-30 15:12:38 UTC (rev 2640)
+++ sandbox/mapgears/geoext.ux/ux/LayerTreeBuilder/lib/GeoExt.ux/LayerTreeBuilder.js 2011-03-31 20:34:56 UTC (rev 2641)
@@ -51,31 +51,21 @@
return scriptLocation;
};
- var jsfiles = new Array(
+ var jsFiles = new Array(
"plugins/LayerTreeBuilderNodeAgent.js",
"widgets/tree/LayerTreeBuilder.js"
);
- var agent = navigator.userAgent;
- var docWrite = (agent.match("MSIE") || agent.match("Safari"));
- if(docWrite) {
- var allScriptTags = new Array(jsfiles.length);
- }
- var host = getScriptLocation() + "lib/GeoExt.ux/";
- for (var i=0, len=jsfiles.length; i<len; i++) {
- if (docWrite) {
- allScriptTags[i] = "<script src='" + host + jsfiles[i] +
+ // use "parser-inserted scripts" for guaranteed execution order
+ // http://hsivonen.iki.fi/script-execution/
+ var scriptTags = new Array(jsFiles.length);
+ var host = getScriptLocation() + "lib/GeoExt.ux/";
+ for (var i=0, len=jsFiles.length; i<len; i++) {
+ scriptTags[i] = "<script src='" + host + jsFiles[i] +
"'></script>";
- } else {
- var s = document.createElement("script");
- s.src = host + jsfiles[i];
- var h = document.getElementsByTagName("head").length ?
- document.getElementsByTagName("head")[0] :
- document.body;
- h.appendChild(s);
- }
}
- if (docWrite) {
- document.write(allScriptTags.join(""));
+ if (scriptTags.length > 0) {
+ document.write(scriptTags.join(""));
}
+
})();
Modified: sandbox/mapgears/geoext.ux/ux/WFSTFeatureEditing/lib/GeoExt.ux/WFSTFeatureEditing.js
===================================================================
--- sandbox/mapgears/geoext.ux/ux/WFSTFeatureEditing/lib/GeoExt.ux/WFSTFeatureEditing.js 2011-03-30 15:12:38 UTC (rev 2640)
+++ sandbox/mapgears/geoext.ux/ux/WFSTFeatureEditing/lib/GeoExt.ux/WFSTFeatureEditing.js 2011-03-31 20:34:56 UTC (rev 2641)
@@ -51,33 +51,23 @@
return scriptLocation;
};
- var jsfiles = new Array(
+ var jsFiles = new Array(
"widgets/WFSTFeatureEditingManager.js",
"widgets/WFSTFeatureEditingPanel.js",
"widgets/WFSTFeatureEditingStatusBar.js",
"widgets/grid/FeatureGrid.js"
);
- var agent = navigator.userAgent;
- var docWrite = (agent.match("MSIE") || agent.match("Safari"));
- if(docWrite) {
- var allScriptTags = new Array(jsfiles.length);
- }
- var host = getScriptLocation() + "lib/GeoExt.ux/";
- for (var i=0, len=jsfiles.length; i<len; i++) {
- if (docWrite) {
- allScriptTags[i] = "<script src='" + host + jsfiles[i] +
+ // use "parser-inserted scripts" for guaranteed execution order
+ // http://hsivonen.iki.fi/script-execution/
+ var scriptTags = new Array(jsFiles.length);
+ var host = getScriptLocation() + "lib/GeoExt.ux/";
+ for (var i=0, len=jsFiles.length; i<len; i++) {
+ scriptTags[i] = "<script src='" + host + jsFiles[i] +
"'></script>";
- } else {
- var s = document.createElement("script");
- s.src = host + jsfiles[i];
- var h = document.getElementsByTagName("head").length ?
- document.getElementsByTagName("head")[0] :
- document.body;
- h.appendChild(s);
- }
}
- if (docWrite) {
- document.write(allScriptTags.join(""));
+ if (scriptTags.length > 0) {
+ document.write(scriptTags.join(""));
}
+
})();
Modified: sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/WMSBrowser.js
===================================================================
--- sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/WMSBrowser.js 2011-03-30 15:12:38 UTC (rev 2640)
+++ sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/WMSBrowser.js 2011-03-31 20:34:56 UTC (rev 2641)
@@ -51,7 +51,7 @@
return scriptLocation;
};
- var jsfiles = new Array(
+ var jsFiles = new Array(
"data/Store.js",
"data/WMSBrowserWMSCapabilitiesStore.js",
"plugins/WMSBrowserAlerts.js",
@@ -62,26 +62,16 @@
"widgets/tree/WMSBrowserTreePanel.js"
);
- var agent = navigator.userAgent;
- var docWrite = (agent.match("MSIE") || agent.match("Safari"));
- if(docWrite) {
- var allScriptTags = new Array(jsfiles.length);
- }
- var host = getScriptLocation() + "lib/GeoExt.ux/";
- for (var i=0, len=jsfiles.length; i<len; i++) {
- if (docWrite) {
- allScriptTags[i] = "<script src='" + host + jsfiles[i] +
+ // use "parser-inserted scripts" for guaranteed execution order
+ // http://hsivonen.iki.fi/script-execution/
+ var scriptTags = new Array(jsFiles.length);
+ var host = getScriptLocation() + "lib/GeoExt.ux/";
+ for (var i=0, len=jsFiles.length; i<len; i++) {
+ scriptTags[i] = "<script src='" + host + jsFiles[i] +
"'></script>";
- } else {
- var s = document.createElement("script");
- s.src = host + jsfiles[i];
- var h = document.getElementsByTagName("head").length ?
- document.getElementsByTagName("head")[0] :
- document.body;
- h.appendChild(s);
- }
}
- if (docWrite) {
- document.write(allScriptTags.join(""));
+ if (scriptTags.length > 0) {
+ document.write(scriptTags.join(""));
}
+
})();
Modified: sandbox/mapgears/geoext.ux/ux/ZoomTo/lib/GeoExt.ux/SingleFile.js
===================================================================
--- sandbox/mapgears/geoext.ux/ux/ZoomTo/lib/GeoExt.ux/SingleFile.js 2011-03-30 15:12:38 UTC (rev 2640)
+++ sandbox/mapgears/geoext.ux/ux/ZoomTo/lib/GeoExt.ux/SingleFile.js 2011-03-31 20:34:56 UTC (rev 2641)
@@ -51,30 +51,20 @@
return scriptLocation;
};
- var jsfiles = new Array(
+ var jsFiles = new Array(
"widgets/ZoomTo.js"
);
- var agent = navigator.userAgent;
- var docWrite = (agent.match("MSIE") || agent.match("Safari"));
- if(docWrite) {
- var allScriptTags = new Array(jsfiles.length);
- }
- var host = getScriptLocation() + "lib/GeoExt.ux/";
- for (var i=0, len=jsfiles.length; i<len; i++) {
- if (docWrite) {
- allScriptTags[i] = "<script src='" + host + jsfiles[i] +
+ // use "parser-inserted scripts" for guaranteed execution order
+ // http://hsivonen.iki.fi/script-execution/
+ var scriptTags = new Array(jsFiles.length);
+ var host = getScriptLocation() + "lib/GeoExt.ux/";
+ for (var i=0, len=jsFiles.length; i<len; i++) {
+ scriptTags[i] = "<script src='" + host + jsFiles[i] +
"'></script>";
- } else {
- var s = document.createElement("script");
- s.src = host + jsfiles[i];
- var h = document.getElementsByTagName("head").length ?
- document.getElementsByTagName("head")[0] :
- document.body;
- h.appendChild(s);
- }
}
- if (docWrite) {
- document.write(allScriptTags.join(""));
+ if (scriptTags.length > 0) {
+ document.write(scriptTags.join(""));
}
+
})();
Modified: sandbox/redlining/ux/FeatureEditing/ux/FeatureEditing.js
===================================================================
--- sandbox/redlining/ux/FeatureEditing/ux/FeatureEditing.js 2011-03-30 15:12:38 UTC (rev 2640)
+++ sandbox/redlining/ux/FeatureEditing/ux/FeatureEditing.js 2011-03-31 20:34:56 UTC (rev 2641)
@@ -51,7 +51,7 @@
return scriptLocation;
};
- var jsfiles = new Array(
+ var jsFiles = new Array(
"widgets/FeatureEditingControler.js",
"widgets/form/FeatureEditingPanel.js",
"widgets/form/RedLiningPanel.js",
@@ -65,26 +65,16 @@
"widgets/plugins/CloseFeatureDialog.js"
);
- var agent = navigator.userAgent;
- var docWrite = (agent.match("MSIE") || agent.match("Safari"));
- if(docWrite) {
- var allScriptTags = new Array(jsfiles.length);
- }
- var host = getScriptLocation() + "ux/";
- for (var i=0, len=jsfiles.length; i<len; i++) {
- if (docWrite) {
- allScriptTags[i] = "<script src='" + host + jsfiles[i] +
+ // use "parser-inserted scripts" for guaranteed execution order
+ // http://hsivonen.iki.fi/script-execution/
+ var scriptTags = new Array(jsFiles.length);
+ var host = getScriptLocation() + "ux/";
+ for (var i=0, len=jsFiles.length; i<len; i++) {
+ scriptTags[i] = "<script src='" + host + jsFiles[i] +
"'></script>";
- } else {
- var s = document.createElement("script");
- s.src = host + jsfiles[i];
- var h = document.getElementsByTagName("head").length ?
- document.getElementsByTagName("head")[0] :
- document.body;
- h.appendChild(s);
- }
}
- if (docWrite) {
- document.write(allScriptTags.join(""));
+ if (scriptTags.length > 0) {
+ document.write(scriptTags.join(""));
}
+
})();
More information about the Commits
mailing list