Merge branch 'wheres_this' of https://github.com/pnorman/openstreetmap-website into...

[rails.git] / app / assets / javascripts / index / contextmenu.js

diff --git a/app/assets/javascripts/index/contextmenu.js b/app/assets/javascripts/index/contextmenu.js
index 1e7251ec62a99b6d3f81f749d183dc28ac10de0a..148ccf908441b99cc23a62da95e81c21c55484df 100644 (file)
--- a/app/assets/javascripts/index/contextmenu.js
+++ b/app/assets/javascripts/index/contextmenu.js
@@ -71,9 +71,8 @@ OSM.initializeContextMenu = function (map) {
   });
 
   map.on("mousedown", function (e) {
-    if (e.shiftKey) map.contextmenu.disable();
-  }).on("mouseup", function () {
-    map.contextmenu.enable();
+    if (e.originalEvent.shiftKey) map.contextmenu.disable();
+    else map.contextmenu.enable();
   });
 
   var updateMenu = function updateMenu () {