Merge pull request mozilla-b2g#7324 from crdlc/bug-827331

Bug 827331 - Long press is fired while slow panning (about contextmenu e...
dscravag · Jan 9, 2013 · 6eaab8f · 6eaab8f
2 parents 3c3c104 + f08c266
commit 6eaab8f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/apps/homescreen/js/grid.js b/apps/homescreen/js/grid.js
@@ -32,14 +32,15 @@ const GridManager = (function() {
     right: 0
   };
 
-  var startEvent, isPanning = false;
+  var startEvent, isPanning = false, deltaX;
 
   function handleEvent(evt) {
     switch (evt.type) {
       case 'mousedown':
         touchStartTimestamp = MouseEventShim.getEventTimestamp(evt);
         evt.stopPropagation();
         startEvent = evt;
+        deltaX = 0;
         attachEvents();
         break;
 
@@ -48,7 +49,7 @@ const GridManager = (function() {
 
         // Start panning immediately but only disable
         // the tap when we've moved far enough.
-        var deltaX = evt.clientX - startEvent.clientX;
+        deltaX = evt.clientX - startEvent.clientX;
         if (deltaX == 0)
           return;
         document.body.dataset.transitioning = 'true';
@@ -170,6 +171,11 @@ const GridManager = (function() {
         break;
 
       case 'contextmenu':
+        if (deltaX !== 0) {
+          evt.stopImmediatePropagation();
+          return;
+        }
+
         if (currentPage > 1 && 'isIcon' in evt.target.dataset) {
           evt.stopImmediatePropagation();
           Homescreen.setMode('edit');