Merge pull request #12446 from crdlc/bug-920411

Bug 920411 - When homescreen is in Edit mode I can still swipe right and...
mozilla-b2g · Sep 26, 2013 · d7309be · d7309be
2 parents 6d9eec5 + 9cc522d
commit d7309be
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/apps/homescreen/js/grid.js b/apps/homescreen/js/grid.js
@@ -198,7 +198,8 @@ var GridManager = (function() {
 
         var refresh;
 
-        if (currentPage === 0) {
+        if (currentPage === 0 ||
+            (Homescreen.isInEditMode() && currentPage === nextLandingPage)) {
           var next = pages[currentPage + 1].container.style;
           refresh = function(e) {
             if (deltaX <= 0) {
@@ -371,7 +372,8 @@ var GridManager = (function() {
       if (forward && currentPage < pages.length - 1) {
         page = page + 1;
       } else if (!forward && page > 0) {
-        page = page - 1;
+        if (!(page === nextLandingPage && Homescreen.isInEditMode()))
+          page = page - 1;
       }
     } else if (!isPanning && evt) {
       releaseEvents();