Changeset 2908

Timestamp:

03/28/07 11:59:49 (2 years ago)

Author:

tschaub

Message:

modify the drag handler so that it only modifies IE's document.onselectstart while dragging - add jsodc text - all browser event handlers now return a boolean - activate and deactivate respect the return of the parent class and return the same

Files:

• trunk/openlayers/lib/OpenLayers/Handler/Drag.js (modified) (3 diffs)

trunk/openlayers/lib/OpenLayers/Handler/Drag.js

@@ -17 +17 @@
-     * 'dragging' until the mouse moves after starting. 
-     * 
-b
+B
-     **/
-    started: false,
-    
-b
-null
+B
+false
-
-    /** @type OpenLayers.Pixel **/
-    start: null,
+
+    /**
+     * @type Function
+     * @private
+     */
+    oldOnselectstart: null,
-
-    /**
@@ -41 +47 @@
-    },
-    
+    /**
+     * Handle mousedown events
+     * @param {Event} evt
+     * @type Boolean
+     * @return Should the event propagate
+     */
-    mousedown: function (evt) {
-        if (this.checkModifiers(evt) && OpenLayers.Event.isLeftClick(evt)) {
-            this.started = true;
-null
+false
-            this.start = evt.xy.clone();
-            // TBD replace with CSS classes
@@ -52 +64 @@
-            return false;
-        }
+        return true;
-    },
-
+    /**
+     * Handle mousemove events
+     * @param {Event} evt
+     * @type Boolean
+     * @return Should the event propagate
+     */
-    mousemove: function (evt) {
-        if (this.started) {
-            this.dragging = true;
-            this.callback("move", [evt.xy]);
+            if(document.onselectstart) {
+                if(!this.oldOnselectstart) {
+                    this.oldOnselectstart = document.onselectstart;
+                    document.onselectstart = function() {return false;}
+                }
+            }
-        }
+        return true;
-    },
-
+    /**
+     * Handle mouseup events
+     * @param {Event} evt
+     * @type Boolean
+     * @return Should the event propagate
+     */
-    mouseup: function (evt) {
-        if (this.started) {
-
+
+
-            // TBD replace with CSS classes
-            this.map.div.style.cursor = "default";
-            this.callback("up", [evt.xy]);
+            if(document.onselectstart) {
+                document.onselectstart = this.oldOnselectstart;
+            }
-        }
+        return true;
-    },
-
+    /**
+     * Handle mouseout events
+     * @param {Event} evt
+     * @type Boolean
+     * @return Should the event propagate
+     */
-    mouseout: function (evt) {
-        if (this.started && OpenLayers.Util.mouseLeft(evt, this.map.div)) {
-            this.started = false; 
-null
+false
-            // TBD replace with CSS classes
-            this.map.div.style.cursor = "default";
-            this.callback("out", []);
+            if(document.onselectstart) {
+                document.onselectstart = this.oldOnselectstart;
+            }
+        }
+        return true;
+    },
+
+    /**
+     * The drag handler captures the click event.  If something else registers
+     * for clicks on the same element, its listener will not be called after a
+     * drag.
+     * @param {Event} evt
+     * @type Boolean
+     * @return Should the event propagate
+     */
+    click: function (evt) {
+        // throw away the first left click event that happens after a mouse up
+        if (OpenLayers.Event.isLeftClick(evt) && this.dragging) {
+            this.dragging = true;
+            return false; 
+        }
+        this.started = false;
+        return true;
+    },
+
+    /**
+     * Activate the handler.
+     * @type Boolean
+     * @return Was activation successful.  Returns false if already active.
+     */
+    activate: function() {
+        if(OpenLayers.Handler.prototype.activate.apply(this, arguments)) {
+            this.dragging = false;
+            return true;
+        } else {
+            return false;
-        }
-    },
-
-    /**
-
-
+
-     * @type Boolean
+     * @return Was deactivation successful.  Returns false if not already active.
-     */
-
-
-
-
-
+
+
+
+
+
+
-        }
-        this.started = false;
-    },
-
-    activate: function (evt) {
-        OpenLayers.Handler.prototype.activate.apply(this, arguments);
-        document.onselectstart = function() { return false; };
-        this.dragging = null;
-    },
-
-    deactivate: function (evt) {
-        OpenLayers.Handler.prototype.deactivate.apply(this, arguments);
-        document.onselectstart = null;
-        this.dragging = null;
-    },
-