From: Tom Hughes <tom@compton.nu>
Date: Sun, 19 Feb 2017 11:38:27 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1445'
X-Git-Tag: live~4652
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1e9a3f8664a1715e59211d25dd7168b95b85fe72?hp=325cd12c248892a78c4042d22fbdd8c1467037fb

Merge remote-tracking branch 'openstreetmap/pull/1445'
---

diff --git a/app/assets/javascripts/index/contextmenu.js b/app/assets/javascripts/index/contextmenu.js
index 1e7251ec6..b19c5d34f 100644
--- a/app/assets/javascripts/index/contextmenu.js
+++ b/app/assets/javascripts/index/contextmenu.js
@@ -71,7 +71,7 @@ OSM.initializeContextMenu = function (map) {
   });
 
   map.on("mousedown", function (e) {
-    if (e.shiftKey) map.contextmenu.disable();
+    if (e.originalEvent.shiftKey) map.contextmenu.disable();
   }).on("mouseup", function () {
     map.contextmenu.enable();
   });