[fusion-commits] r2558 - sandbox/adsk/2.4j/lib/OpenLayers

[svn_fusion at osgeo.org]

Author: liuar
Date: 2012-07-29 23:57:03 -0700 (Sun, 29 Jul 2012)
New Revision: 2558

Modified:
   sandbox/adsk/2.4j/lib/OpenLayers/OpenLayers.js
Log:
On behalf of Spark Liu: Fix google copyright problem using the fix at:
https://github.com/openlayers/openlayers/commit/92f04a7a4277a6c818ef2d40a2856910ed72d3d6

Modified: sandbox/adsk/2.4j/lib/OpenLayers/OpenLayers.js
===================================================================
--- sandbox/adsk/2.4j/lib/OpenLayers/OpenLayers.js	2012-07-26 10:00:05 UTC (rev 2557)
+++ sandbox/adsk/2.4j/lib/OpenLayers/OpenLayers.js	2012-07-30 06:57:03 UTC (rev 2558)
@@ -40629,29 +40629,30 @@
 
         var cache = OpenLayers.Layer.Google.cache[this.map.id];
         var container = this.map.viewPortDiv;
-        
-        // move the Map Data popup to the container, if any
-        while (div.lastChild.style.display == "none") {
-            container.appendChild(div.lastChild);
+        for (var i=div.children.length-1; i>=0; --i) {
+            if (div.children[i].style.zIndex == 1000001) {
+                var termsOfUse = div.children[i];
+                container.appendChild(termsOfUse);
+                termsOfUse.style.zIndex = "1100";
+                termsOfUse.style.bottom = "";
+                termsOfUse.className = "olLayerGoogleCopyright olLayerGoogleV3";
+                termsOfUse.style.display = "";
+                cache.termsOfUse = termsOfUse;
+            }
+            if (div.children[i].style.zIndex == 1000000) {
+                var poweredBy = div.children[i];
+                container.appendChild(poweredBy);
+                poweredBy.style.zIndex = "1100";
+                poweredBy.style.bottom = "";
+                poweredBy.className = "olLayerGooglePoweredBy olLayerGoogleV3 gmnoprint";
+                poweredBy.style.display = "";
+                cache.poweredBy = poweredBy;
+            }
+            if (div.children[i].style.zIndex == 10000002) {
+                container.appendChild(div.children[i]);
+            }
         }
 
-        // move the ToS and branding stuff up to the container div
-        var termsOfUse = div.lastChild;
-        container.appendChild(termsOfUse);
-        termsOfUse.style.zIndex = "1100";
-        termsOfUse.style.bottom = "";
-        termsOfUse.className = "olLayerGoogleCopyright olLayerGoogleV3";
-        termsOfUse.style.display = "";
-        cache.termsOfUse = termsOfUse;
-
-        var poweredBy = div.lastChild;
-        container.appendChild(poweredBy);
-        poweredBy.style.zIndex = "1100";
-        poweredBy.style.bottom = "";
-        poweredBy.className = "olLayerGooglePoweredBy olLayerGoogleV3 gmnoprint";
-        poweredBy.style.display = "";
-        cache.poweredBy = poweredBy;
-
         this.setGMapVisibility(this.visibility);
 
     },