Merge pull request #20138 from EverythingMe/revert-hb-fix

Bug 1021664 - Revert patch for homebutton handling while Collection is o...
mozilla-b2g · Jun 8, 2014 · 22b545e · 22b545e
2 parents 7c0a085 + 61e17ee
commit 22b545e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 31 deletions.
diff --git a/apps/verticalhome/js/app.js b/apps/verticalhome/js/app.js
@@ -9,12 +9,9 @@
   function App() {
     this.scrollable = document.querySelector('.scrollable');
     this.grid = document.getElementById('icons');
-    this.homescreenFocused = true;
 
     window.addEventListener('hashchange', this);
     window.addEventListener('gaiagrid-saveitems', this);
-    window.addEventListener('gaiagrid-collection-open', this);
-    window.addEventListener('gaiagrid-collection-close', this);
   }
 
   App.prototype = {
@@ -71,21 +68,14 @@
           this.itemStore.save(this.grid.getItems());
           break;
 
-        case 'gaiagrid-collection-open':
-          this.homescreenFocused = false;
-          break;
-
-        case 'gaiagrid-collection-close':
-          this.homescreenFocused = true;
-          break;
-
         case 'hashchange':
           if (this.grid._grid.dragdrop.inEditMode) {
             this.grid._grid.dragdrop.exitEditMode();
             return;
           }
 
-          if (!this.homescreenFocused || document.hidden) {
+          // Bug 1021518 - ignore home button taps on lockscreen
+          if (document.hidden) {
             return;
           }
 

diff --git a/apps/verticalhome/js/contextmenu_ui.js b/apps/verticalhome/js/contextmenu_ui.js
@@ -1,5 +1,4 @@
 'use strict';
-/* global app */
 /* global LazyLoader */
 /* global MozActivity */
 /* global wallpaper */
@@ -62,14 +61,7 @@
             }
           });
 
-          app.homescreenFocused = false;
-
-          activity.onsuccess = function onsuccess() {
-            app.homescreenFocused = true;
-          };
-
           activity.onerror = function onerror(e) {
-            app.homescreenFocused = true;
             if (this.error.name !== 'ActivityCanceled') {
               alert(this.error.name);
             }

diff --git a/apps/verticalhome/test/unit/app_test.js b/apps/verticalhome/test/unit/app_test.js
@@ -31,7 +31,6 @@ suite('app.js > ', function() {
     loadBodyHTML('/index.html');
     require('/js/app.js', function() {
       initialize();
-      assert.ok(app.homescreenFocused);
       done();
     });
   });

diff --git a/shared/elements/gaia_grid/js/items/collection.js b/shared/elements/gaia_grid/js/items/collection.js
@@ -76,19 +76,10 @@
      * Launches the application for this icon.
      */
     launch: function() {
-      var activity = new MozActivity({
+      new MozActivity({
         name: 'view-collection',
         data: this.detail
       });
-
-      window.dispatchEvent(new CustomEvent('gaiagrid-collection-open'));
-
-      activity.onsuccess = onClose;
-      activity.onerror = onClose;
-
-      function onClose() {
-        window.dispatchEvent(new CustomEvent('gaiagrid-collection-close'));
-      }
     },