Removing use of deprecated control.

git-svn-id: http://svn.openlayers.org/trunk/openlayers@9234 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf

examples/controls.html

@@ -11,7 +11,6 @@
                 map = new OpenLayers.Map('map', {
                     controls: [
                         new OpenLayers.Control.PanZoomBar(),
-                        new OpenLayers.Control.MouseToolbar(),
                         new OpenLayers.Control.LayerSwitcher({'ascending':false}),
                         new OpenLayers.Control.Permalink(),
                         new OpenLayers.Control.ScaleLine(),

lib/OpenLayers/Control.js

@@ -304,6 +304,11 @@ OpenLayers.Control = OpenLayers.Class({
             this.handler.activate();
         }
         this.active = true;
+        if(this.map) {
+            OpenLayers.Element.addClass(
+                this.map.div, this.displayClass + "Active"
+            );
+        }
         this.events.triggerEvent("activate");
         return true;
     },
@@ -323,6 +328,11 @@ OpenLayers.Control = OpenLayers.Class({
                 this.handler.deactivate();
             }
             this.active = false;
+            if(this.map) {
+                OpenLayers.Element.removeClass(
+                    this.map.div, this.displayClass + "Active"
+                );
+            }
             this.events.triggerEvent("deactivate");
             return true;
         }

lib/OpenLayers/Control/DragFeature.js

@@ -162,6 +162,9 @@ OpenLayers.Control.DragFeature = OpenLayers.Class(OpenLayers.Control, {
         this.feature = null;
         this.dragging = false;
         this.lastPixel = null;
+        OpenLayers.Element.removeClass(
+            this.map.div, this.displayClass + "Over"
+        );
         return OpenLayers.Control.prototype.deactivate.apply(this, arguments);
     },
 
@@ -178,8 +181,7 @@ OpenLayers.Control.DragFeature = OpenLayers.Class(OpenLayers.Control, {
             this.feature = feature;
             this.handlers.drag.activate();
             this.over = true;
-            // TBD replace with CSS classes
+            OpenLayers.Element.addClass(this.map.div, this.displayClass + "Over");
-            this.map.div.style.cursor = "move";
         } else {
             if(this.feature.id == feature.id) {
                 this.over = true;
@@ -228,12 +230,6 @@ OpenLayers.Control.DragFeature = OpenLayers.Class(OpenLayers.Control, {
     upFeature: function(pixel) {
         if(!this.over) {
             this.handlers.drag.deactivate();
-            // TBD replace with CSS classes
-            this.map.div.style.cursor = "default";
-        } else {
-            // the drag handler itself resetted the cursor, so
-            // set it back to "move" here
-            this.map.div.style.cursor = "move";
         }
     },
 
@@ -260,8 +256,9 @@ OpenLayers.Control.DragFeature = OpenLayers.Class(OpenLayers.Control, {
         if(!this.handlers.drag.dragging) {
             this.over = false;
             this.handlers.drag.deactivate();
-            // TBD replace with CSS classes
+            OpenLayers.Element.removeClass(
-            this.map.div.style.cursor = "default";
+                this.map.div, this.displayClass + "Over"
+            );
             this.feature = null;
         } else {
             if(this.feature.id == feature.id) {

lib/OpenLayers/Handler/Box.js

@@ -83,8 +83,9 @@ OpenLayers.Handler.Box = OpenLayers.Class(OpenLayers.Handler, {
         this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
         this.map.viewPortDiv.appendChild(this.zoomBox);
 
-        // TBD: use CSS classes instead
+        OpenLayers.Element.addClass(
-        this.map.div.style.cursor = "crosshair";
+            this.map.div, "olDrawBox"
+        );
     },
 
     /**
@@ -133,9 +134,6 @@ OpenLayers.Handler.Box = OpenLayers.Class(OpenLayers.Handler, {
         } 
         this.removeBox();
 
-        // TBD: use CSS classes instead
-        this.map.div.style.cursor = "";
-
         this.callback("done", [result]);
     },
 
@@ -147,6 +145,10 @@ OpenLayers.Handler.Box = OpenLayers.Class(OpenLayers.Handler, {
         this.map.viewPortDiv.removeChild(this.zoomBox);
         this.zoomBox = null;
         this.boxCharacteristics = null;
+        OpenLayers.Element.removeClass(
+            this.map.div, "olDrawBox"
+        );
+
     },
 
     /**

lib/OpenLayers/Handler/Drag.js

@@ -177,8 +177,9 @@ OpenLayers.Handler.Drag = OpenLayers.Class(OpenLayers.Handler, {
             this.started = true;
             this.start = evt.xy;
             this.last = evt.xy;
-            // TBD replace with CSS classes
+            OpenLayers.Element.addClass(
-            this.map.div.style.cursor = "move";
+                this.map.div, "olDragDown"
+            );
             this.down(evt);
             this.callback("down", [evt.xy]);
             OpenLayers.Event.stop(evt);
@@ -247,8 +248,9 @@ OpenLayers.Handler.Drag = OpenLayers.Class(OpenLayers.Handler, {
             var dragged = (this.start != this.last);
             this.started = false;
             this.dragging = false;
-            // TBD replace with CSS classes
+            OpenLayers.Element.removeClass(
-            this.map.div.style.cursor = "";
+                this.map.div, "olDragDown"
+            );
             this.up(evt);
             this.callback("up", [evt.xy]);
             if(dragged) {
@@ -274,8 +276,9 @@ OpenLayers.Handler.Drag = OpenLayers.Class(OpenLayers.Handler, {
             var dragged = (this.start != this.last);
             this.started = false; 
             this.dragging = false;
-            // TBD replace with CSS classes
+            OpenLayers.Element.removeClass(
-            this.map.div.style.cursor = "";
+                this.map.div, "olDragDown"
+            );
             this.out(evt);
             this.callback("out", []);
             if(dragged) {
@@ -336,6 +339,9 @@ OpenLayers.Handler.Drag = OpenLayers.Class(OpenLayers.Handler, {
             this.start = null;
             this.last = null;
             deactivated = true;
+            OpenLayers.Element.removeClass(
+                this.map.div, "olDragDown"
+            );
         }
         return deactivated;
     },

tests/Control/DragFeature.html

@@ -171,7 +171,7 @@
     }
 
     function test_Control_DragFeature_up(t) {
-        t.plan(7);
+        t.plan(6);
         var map = new OpenLayers.Map("map");
         var layer = new OpenLayers.Layer.Vector();
         map.addLayer(layer);
@@ -189,8 +189,8 @@
         map.events.triggerEvent("mousemove", {type: "mousemove"});
         t.eq(control.over, true,
             "mouseover on a feature sets the over property to true");
-        t.eq(control.map.div.style.cursor, "move",
+        t.ok(OpenLayers.Element.hasClass(control.map.div, "olControlDragFeatureOver"),
-            "mouseover on a feature sets the cursor to move");
+            "mouseover on a feature adds class name to map container");
         t.eq(control.handlers.drag.active, true,
             "mouseover on a feature activates drag handler");
 
@@ -198,8 +198,6 @@
         // over the dragged feature
         control.handlers.drag.started = true;
         map.events.triggerEvent("mouseup", {type: "mouseup"});
-        t.eq(control.map.div.style.cursor, "move",
-            "mouseup while still over dragged feature does not reset cursor to default");
         t.eq(control.handlers.drag.active, true,
             "mouseup while still over dragged feature does not deactivate drag handler");
 
@@ -208,12 +206,12 @@
         control.handlers.drag.started = true;
         control.over = false;
         map.events.triggerEvent("mouseup", {type: "mouseup"});
-        t.eq(control.map.div.style.cursor, "default",
-            "mouseup resets cursor to default");
         t.eq(control.handlers.drag.active, false,
             "mouseup deactivates drag handler");
 
         control.deactivate();
+        t.ok(!OpenLayers.Element.hasClass(control.map.div, "olControlDragFeatureOver"),
+            "deactivate removes class name from map container");
     }
     
     function test_Control_DragFeature_done(t) {

theme/default/style.css

@@ -327,4 +327,17 @@ div.olControlMousePosition {
 
 .olCursorWait {
     cursor: wait;
-}
+}
+.olDragDown {
+    cursor: move;
+}
+.olDrawBox {
+    cursor: crosshair;
+}
+.olControlDragFeatureOver {
+    cursor: move;
+}
+.olControlDragFeatureActive.olControlDragFeatureOver.olDragDown {
+    cursor: -moz-grabbing;
+}
+