dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 10030 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-03-07 10:01:15 +0100
message:
  MapFish scripts included manually (FF fix).
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/index.html
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/MapFish.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/index.html'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/index.html	2013-01-17 13:09:10 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/index.html	2013-03-07 08:59:38 +0000
@@ -39,9 +39,21 @@
     <script type="text/javascript" src="scripts/geoext/script/custom.js"></script>
 
     <script type="text/javascript" src="../../dhis-web-commons/javascripts/periodTypeNoDep.js"></script>
+
     <script type="text/javascript" src="i18n.action"></script>
+
     <script type="text/javascript" src="scripts/core.js"></script>
+
     <script type="text/javascript" src="scripts/mapfish/MapFish.js"></script>
+    <script type="text/javascript" src="scripts/mapfish/core/Color.js"></script>
+    <script type="text/javascript" src="scripts/mapfish/core/GeoStat.js"></script>
+    <script type="text/javascript" src="scripts/mapfish/core/GeoStat/Boundary.js"></script>
+    <script type="text/javascript" src="scripts/mapfish/core/GeoStat/Thematic1.js"></script>
+    <script type="text/javascript" src="scripts/mapfish/core/GeoStat/Thematic2.js"></script>
+    <script type="text/javascript" src="scripts/mapfish/core/GeoStat/Facility.js"></script>
+    <script type="text/javascript" src="scripts/mapfish/core/GeoStat/Symbol.js"></script>
+    <script type="text/javascript" src="scripts/mapfish/core/Util.js"></script>
+
     <script type="text/javascript" src="scripts/app.js"></script>
 </body>
 

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/MapFish.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/MapFish.js	2012-08-20 15:42:35 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/MapFish.js	2013-03-07 08:59:38 +0000
@@ -23,14 +23,14 @@
 
             var scriptLocation = "";
             var scriptName = mapfish._scriptName;
-         
+
             var scripts = document.getElementsByTagName('script');
             for (var i = 0; i < scripts.length; i++) {
                 var src = scripts[i].getAttribute('src');
                 if (src) {
-                    var index = src.lastIndexOf(scriptName); 
+                    var index = src.lastIndexOf(scriptName);
                     // is it found, at the end of the URL?
-                    if ((index > -1) && (index + scriptName.length == src.length)) {  
+                    if ((index > -1) && (index + scriptName.length == src.length)) {
                         scriptLocation = src.slice(0, -scriptName.length);
                         break;
                     }
@@ -39,7 +39,7 @@
             return scriptLocation;
          }
     };
-    
+
 	var jsfiles = new Array(
 		"core/Color.js",
 		"core/GeoStat.js",
@@ -48,12 +48,12 @@
 		"core/GeoStat/Thematic2.js",
 		"core/GeoStat/Facility.js",
 		"core/GeoStat/Symbol.js",
-		"core/Util.js",
-		"widgets/geostat/Boundary.js",
-		"widgets/geostat/Thematic1.js",
-		"widgets/geostat/Thematic2.js",
-		"widgets/geostat/Facility.js",
-		"widgets/geostat/Symbol.js"
+		"core/Util.js"
+		//"widgets/geostat/Boundary.js",
+		//"widgets/geostat/Thematic1.js",
+		//"widgets/geostat/Thematic2.js",
+		//"widgets/geostat/Facility.js",
+		//"widgets/geostat/Symbol.js"
 	);
 
 	var allScriptTags = "";
@@ -61,19 +61,19 @@
 
 	for (var i = 0; i < jsfiles.length; i++) {
 		if (/MSIE/.test(navigator.userAgent) || /Safari/.test(navigator.userAgent)) {
-			var currentScriptTag = "<script src='" + host + jsfiles[i] + "'></script>"; 
+			var currentScriptTag = "<script src='" + host + jsfiles[i] + "'></script>";
 			allScriptTags += currentScriptTag;
 		} else {
 			var s = document.createElement("script");
 			s.src = host + jsfiles[i];
-			var h = document.getElementsByTagName("head").length ? 
-					   document.getElementsByTagName("head")[0] : 
+			var h = document.getElementsByTagName("head").length ?
+					   document.getElementsByTagName("head")[0] :
 					   document.body;
 			h.appendChild(s);
 		}
 	}
 	if (allScriptTags) {
-		document.write(allScriptTags);
+		//document.write(allScriptTags);
 	}
-	
+
 })();