Merge pull request #17892 from cctuan/990435

Bug 990435 - [tarako] the two homescreens randomly overlapped with each ...
mozilla-b2g · Apr 3, 2014 · ab6cbca · ab6cbca
2 parents 43a76a6 + 5a190c8
commit ab6cbca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/apps/homescreen/js/dock.js b/apps/homescreen/js/dock.js
@@ -20,6 +20,12 @@ var DockManager = (function() {
   var touchmove = isTouch ? 'touchmove' : 'mousemove';
   var touchend = isTouch ? 'touchend' : 'mouseup';
 
+  document.addEventListener('visibilitychange', function() {
+    if (document.hidden == false) {
+      windowWidth = window.innerWidth;
+    }
+  });
+
   var getX = (function getXWrapper() {
     return isTouch ? function(e) { return e.touches[0].pageX } :
                      function(e) { return e.pageX };

diff --git a/apps/homescreen/js/grid.js b/apps/homescreen/js/grid.js
@@ -41,6 +41,13 @@ var GridManager = (function() {
   var container;
 
   var windowWidth = window.innerWidth;
+  document.addEventListener('visibilitychange', function() {
+    if (document.hidden == false) {
+      windowWidth = window.innerWidth;
+      DEVICE_HEIGHT = window.innerHeight;
+    }
+  });
+
   var swipeThreshold, swipeFriction, tapThreshold;
 
   var dragging = false;