Merge branch '2.12' of git://github.com/openlayers/openlayers

lib/OpenLayers.js

@@ -414,4 +414,4 @@
 /**
  * Constant: VERSION_NUMBER
  */
-OpenLayers.VERSION_NUMBER="Release 2.12-rc3";
+OpenLayers.VERSION_NUMBER="Release 2.12-rc4";

lib/OpenLayers/Layer/Google/v3.js

@@ -137,27 +137,31 @@ OpenLayers.Layer.Google.v3 = {
         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);
-        }
-
         // move the ToS and branding stuff up to the container div
-        var termsOfUse = div.lastChild;
+        // depends on value of zIndex, which is not robust
-        container.appendChild(termsOfUse);
+        for (var i=div.children.length-1; i>=0; --i) {
-        termsOfUse.style.zIndex = "1100";
+            if (div.children[i].style.zIndex == 1000001) {
-        termsOfUse.style.bottom = "";
+                var termsOfUse = div.children[i];
-        termsOfUse.className = "olLayerGoogleCopyright olLayerGoogleV3";
+                container.appendChild(termsOfUse);
-        termsOfUse.style.display = "";
+                termsOfUse.style.zIndex = "1100";
-        cache.termsOfUse = termsOfUse;
+                termsOfUse.style.bottom = "";
-
+                termsOfUse.className = "olLayerGoogleCopyright olLayerGoogleV3";
-        var poweredBy = div.lastChild;
+                termsOfUse.style.display = "";
-        container.appendChild(poweredBy);
+                cache.termsOfUse = termsOfUse;
-        poweredBy.style.zIndex = "1100";
+            }
-        poweredBy.style.bottom = "";
+            if (div.children[i].style.zIndex == 1000000) {
-        poweredBy.className = "olLayerGooglePoweredBy olLayerGoogleV3 gmnoprint";
+                var poweredBy = div.children[i];
-        poweredBy.style.display = "";
+                container.appendChild(poweredBy);
-        cache.poweredBy = 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]);
+            }
+        }
 
         this.setGMapVisibility(this.visibility);
 

lib/OpenLayers/SingleFile.js

@@ -7,7 +7,7 @@ var OpenLayers = {
     /**
      * Constant: VERSION_NUMBER
      */
-    VERSION_NUMBER: "Release 2.12-rc3",
+    VERSION_NUMBER: "Release 2.12-rc4",
 
     /**
      * Constant: singleFile