Ticket #1359: RightMouseV2.patch

lib/OpenLayers/Control/Navigation.js

@@ -105 +105 @@
-     */
-    draw: function() {
-        this.handlers.click = new OpenLayers.Handler.Click(this, 
-
-
+, 'dblrightclick': this.defaultDblRightClick
+ 
-                                          'double': true, 
-                                          'stopDouble': true
-                                        });
@@ -133 +133 @@
-    },
-
-    /**
+     * Method: defaultRightDblClick 
+     * 
+     * Parameters:
+     * evt - {Event} 
+     */
+    defaultDblRightClick: function (evt) {
+        var newCenter = this.map.getLonLatFromViewPortPx( evt.xy ); 
+        this.map.setCenter(newCenter, this.map.zoom - 1);
+    },
+    
+    /**
-     * Method: wheelChange  
-     *
-     * Parameters:

lib/OpenLayers/Events.js

@@ -105 +105 @@
-    },
-
-    /**
+     * Method: isRightClick
+     * Determine whether event was caused by a right mouse click. 
+     *
+     * Parameters:
+     * event - {Event} 
+     * 
+     * Returns:
+     * {Boolean}
+     */
+     isRightClick: function(event) {
+        return (((event.which) && (event.which == 3)) ||
+                ((event.button) && (event.button == 2)));
+    },
+     
+    /**
-     * Method: stop
-     * Stops an event from propagating. 
-     *
@@ -352 +367 @@
-    BROWSER_EVENTS: [
-        "mouseover", "mouseout",
-        "mousedown", "mouseup", "mousemove", 
-
+ "rightclick", "dblrightclick",
-        "resize", "focus", "blur"
-    ],
-

lib/OpenLayers/Handler/Click.js

@@ -90 +90 @@
-    down: null,
-    
-    /**
+     * Property: rightclickTimerId
+     * {Number} The id of the right mouse timeout waiting to clear the <delayedEvent>.
+     */
+    rightclickTimerId: null,
+    
+    /**
-     * Constructor: OpenLayers.Handler.Click
-     * Create a new click handler.
-     * 
@@ -125 +131 @@
-     * {Boolean} Continue propagating this event.
-     */
-    mousedown: null,
+    /**
+     * Method: mouseup
+     * Handle mouseup.  Installed to support collection of right mouse events
+     * 
+     * Returns:
+     * {Boolean} Continue propagating this event.
+     */
+    mouseup:  function (evt) {
+        var propagate = true;
+        // Collect right mouse clicks from the mouseup
+        // IE - ignores the second right click in mousedown so using mouseup instead
+        if (this.checkModifiers(evt) && OpenLayers.Event.isRightClick(evt)) {
+          return this.rightclick(evt);            
+        }
+        return propagate;
+    },
-    
-    /**
+     * Method: rightclick
+     * Handle rightclick.  For a dblrightclick, we get two clicks
+     * so we need to always register for dblrightclick to properly handle single clicks.
+     *     
+     * Returns:
+     * {Boolean} Continue propagating this event.
+     */
+    rightclick: function(evt) {
+        if(this.passesTolerance(evt)) {
+           if(this.rightclickTimerId != null) {
+                // Second click received before timeout this must be a double click
+                this.clearTimer();      
+                this.callback('dblrightclick', [evt]);
+                return !this.stopDouble;
+            } else { 
+            // set the rightclickTimerId, send evt only if double is true else trigger single
+            var clickEvent = this.double ?
+                OpenLayers.Util.extend({}, evt) : this.callback('rightclick', [evt]);
+            this.rightclickTimerId = window.setTimeout(
+                OpenLayers.Function.bind(this.delayedRightCall, this, clickEvent),
+                    this.delay );
+            } 
+        }
+        return !this.stopSingle;
+    },
+    
+    /**
+     * Method: delayedRightCall
+     * Sets <rightclickTimerId> to null.  And optionally triggers the rightclick callback if
+     *     evt is set.
+     */
+    delayedRightCall: function(evt) {
+        this.rightclickTimerId = null;
+        if(evt) {
+           this.callback('rightclick', [evt]);
+        }
+        return !this.stopSingle;
+    },
+    
+    /**
-     * Method: dblclick
-     * Handle dblclick.  For a dblclick, we get two clicks in some browsers
-     *     (FF) and one in others (IE).  So we need to always register for

lib/OpenLayers/Map.js

@@ -421 +421 @@
-        this.layerContainerDiv.style.zIndex=this.Z_INDEX_BASE['Popup']-1;
-        
-        this.viewPortDiv.appendChild(this.layerContainerDiv);
-
+
+
+
+
-        this.events = new OpenLayers.Events(this, 
-                                            this.div, 
-                                            this.EVENT_TYPES,