[Commits] r2640 - sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux

[commits at geoext.org]

Author: edube
Date: 2011-03-30 17:12:38 +0200 (Wed, 30 Mar 2011)
New Revision: 2640

Modified:
   sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/SingleFile.js
Log:
AttributeFilterPanel ux: fix SingleFile.js for compatibility with Firefox 4 script loading

Modified: sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/SingleFile.js
===================================================================
--- sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/SingleFile.js	2011-03-28 15:32:55 UTC (rev 2639)
+++ sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/SingleFile.js	2011-03-30 15:12:38 UTC (rev 2640)
@@ -51,34 +51,24 @@
 		return scriptLocation;
 	};
 
-	var jsfiles = new Array(
+	var jsFiles = new Array(
 		"widgets/attributefilterpanel/AttributeFilterBasicForm.js",
 		"widgets/attributefilterpanel/AttributeFilterPanel.js",
 		"widgets/attributefilterpanel/FormToFilter.js",
 		"widgets/attributefilterpanel/FilterAction.js",
 		"widgets/attributefilterpanel/ResetAction.js"
 	);
+    
+    // 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>"; 
+    }
+    if (scriptTags.length > 0) {
+        document.write(scriptTags.join(""));
+    }
 
-	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] +
-							   "'></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(""));
-	}
 })();