[OpenLayers-Commits] r11455 - in trunk/openlayers/lib/OpenLayers: Control Handler

[commits-20090109 at openlayers.org]

Author: crschmidt
Date: 2011-02-25 00:30:50 -0800 (Fri, 25 Feb 2011)
New Revision: 11455

Modified:
   trunk/openlayers/lib/OpenLayers/Control/MouseDefaults.js
   trunk/openlayers/lib/OpenLayers/Control/MouseToolbar.js
   trunk/openlayers/lib/OpenLayers/Control/OverviewMap.js
   trunk/openlayers/lib/OpenLayers/Handler/Box.js
Log:
This patch causes the zoomBox to become visible again, after the changes
to add an eventsDiv, and fixes the OverviewMap to work again. r=bartvde,
(Closes #3104)


Modified: trunk/openlayers/lib/OpenLayers/Control/MouseDefaults.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Control/MouseDefaults.js	2011-02-25 07:25:03 UTC (rev 11454)
+++ trunk/openlayers/lib/OpenLayers/Control/MouseDefaults.js	2011-02-25 08:30:50 UTC (rev 11455)
@@ -165,7 +165,7 @@
             this.zoomBox.style.opacity = "0.50";
             this.zoomBox.style.fontSize = "1px";
             this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
-            this.map.viewPortDiv.appendChild(this.zoomBox);
+            this.map.eventsDiv.appendChild(this.zoomBox);
         }
         document.onselectstart = OpenLayers.Function.False;
         OpenLayers.Event.stop(evt);
@@ -302,7 +302,7 @@
      * Remove the zoombox from the screen and nullify our reference to it.
      */
     removeZoomBox: function() {
-        this.map.viewPortDiv.removeChild(this.zoomBox);
+        this.map.eventsDiv.removeChild(this.zoomBox);
         this.zoomBox = null;
     },
 

Modified: trunk/openlayers/lib/OpenLayers/Control/MouseToolbar.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Control/MouseToolbar.js	2011-02-25 07:25:03 UTC (rev 11454)
+++ trunk/openlayers/lib/OpenLayers/Control/MouseToolbar.js	2011-02-25 08:30:50 UTC (rev 11455)
@@ -207,7 +207,7 @@
                 this.zoomBox.style.opacity = "0.50";
                 this.zoomBox.style.fontSize = "1px";
                 this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
-                this.map.viewPortDiv.appendChild(this.zoomBox);
+                this.map.eventsDiv.appendChild(this.zoomBox);
                 this.performedDrag = true;
                 break;
             case "measure":

Modified: trunk/openlayers/lib/OpenLayers/Control/OverviewMap.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Control/OverviewMap.js	2011-02-25 07:25:03 UTC (rev 11454)
+++ trunk/openlayers/lib/OpenLayers/Control/OverviewMap.js	2011-02-25 08:30:50 UTC (rev 11455)
@@ -157,7 +157,7 @@
             this.handlers.drag.destroy();
         }
 
-        this.ovmap && this.ovmap.viewPortDiv.removeChild(this.extentRectangle);
+        this.ovmap && this.ovmap.eventsDiv.removeChild(this.extentRectangle);
         this.extentRectangle = null;
 
         if (this.rectEvents) {
@@ -489,7 +489,7 @@
                         {controls: [], maxResolution: 'auto', 
                          fallThrough: false}, this.mapOptions);
         this.ovmap = new OpenLayers.Map(this.mapDiv, options);
-        this.ovmap.viewPortDiv.appendChild(this.extentRectangle);
+        this.ovmap.eventsDiv.appendChild(this.extentRectangle);
         
         // prevent ovmap from being destroyed when the page unloads, because
         // the OverviewMap control has to do this (and does it).

Modified: trunk/openlayers/lib/OpenLayers/Handler/Box.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Handler/Box.js	2011-02-25 07:25:03 UTC (rev 11454)
+++ trunk/openlayers/lib/OpenLayers/Handler/Box.js	2011-02-25 08:30:50 UTC (rev 11455)
@@ -96,10 +96,10 @@
              new OpenLayers.Pixel(-9999, -9999));
         this.zoomBox.className = this.boxDivClassName;                                         
         this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
-        this.map.viewPortDiv.appendChild(this.zoomBox);
+        this.map.eventsDiv.appendChild(this.zoomBox);
 
         OpenLayers.Element.addClass(
-            this.map.viewPortDiv, "olDrawBox"
+            this.map.eventsDiv, "olDrawBox"
         );
     },
 
@@ -157,11 +157,11 @@
      * Remove the zoombox from the screen and nullify our reference to it.
      */
     removeBox: function() {
-        this.map.viewPortDiv.removeChild(this.zoomBox);
+        this.map.eventsDiv.removeChild(this.zoomBox);
         this.zoomBox = null;
         this.boxCharacteristics = null;
         OpenLayers.Element.removeClass(
-            this.map.viewPortDiv, "olDrawBox"
+            this.map.eventsDiv, "olDrawBox"
         );
 
     },