Merge pull request #32297 from Cwiiis/bug1212345-new-homescreen-remov…

…e-longpress-menu Bug 1212345 - Remove long-press menu. r=gmarty
mozilla-b2g · Oct 9, 2015 · 69b3a59 · 69b3a59
2 parents 9711ea4 + 669447e
commit 69b3a59
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 104 deletions.
diff --git a/apps/homescreen/index.html b/apps/homescreen/index.html
@@ -83,10 +83,6 @@
           <button class="action" data-l10n-id="resume-download-action"></button>
           <button on-click="close" data-l10n-id="cancel-action"></button>
         </gaia-dialog>
-        <gaia-dialog id="settings" class="dialog-action">
-          <button class="action" data-l10n-id="homescreen-settings"></button>
-          <button on-click="close" data-l10n-id="cancel-action"></button>
-        </gaia-dialog>
       </div><!--
    --><div id="pages-panel">
         <div class="shadow"></div>

diff --git a/apps/homescreen/js/app.js b/apps/homescreen/js/app.js
@@ -87,9 +87,7 @@ const SETTINGS_VERSION = 0;
     this.edit = document.getElementById('edit');
     this.cancelDownload = document.getElementById('cancel-download');
     this.resumeDownload = document.getElementById('resume-download');
-    this.settingsDialog = document.getElementById('settings');
-    this.dialogs =
-      [this.cancelDownload, this.resumeDownload, this.settingsDialog];
+    this.dialogs = [this.cancelDownload, this.resumeDownload];
 
     // XXX Working around gaia-components issue #8
     var dialog;
@@ -141,7 +139,6 @@ const SETTINGS_VERSION = 0;
     this.updatePanelIndicator();
 
     // Signal handlers
-    document.body.addEventListener('contextmenu', this);
     this.panels.addEventListener('scroll', this);
     this.scrollable.addEventListener('scroll', this);
     this.icons.addEventListener('activate', this);
@@ -685,25 +682,6 @@ const SETTINGS_VERSION = 0;
       var icon, child, id;
 
       switch (e.type) {
-      // Show the settings menu when the user long-presses and we aren't in
-      // a drag
-      case 'contextmenu':
-        if (!document.body.classList.contains('dragging')) {
-          this.showActionDialog(this.settingsDialog, null,
-            [() => {
-               new MozActivity({
-                 name: 'configure',
-                 data: {
-                   target: 'device',
-                   section: 'homescreens'
-                 }
-               });
-             }]);
-          e.stopImmediatePropagation();
-          e.preventDefault();
-        }
-        break;
-
       // Display the top shadow when scrolling down
       case 'scroll':
         if (e.target === this.panels) {

diff --git a/apps/homescreen/locales/homescreen.en-US.properties b/apps/homescreen/locales/homescreen.en-US.properties
@@ -4,8 +4,6 @@ stop-download-action=Stop
 resume-download-body=Do you want to download {{name}}?
 resume-download-action=Download
 
-homescreen-settings=Homescreen Settings
-
 cancel-action=Cancel
 
 apps-panel.ariaLabel=Applications

diff --git a/apps/homescreen/test/marionette/lib/homescreen.js b/apps/homescreen/test/marionette/lib/homescreen.js
@@ -251,22 +251,6 @@ Homescreen.prototype = {
     }, [icon, this.appsScrollable, icon.location().y]);
   },
 
-  /**
-   * Opens the settings menu by long-pressing on the empty space at the bottom
-   * of the icon grid.
-   */
-  openSettingsMenu: function() {
-    var rect = this.appsScrollable.scriptWith(function(el) {
-      el.scrollTop = el.scrollTopMax;
-      return el.getBoundingClientRect();
-    });
-    var actions = this.client.loader.getActions();
-    actions.press(this.appsScrollable, rect.width / 2, rect.height - 1).
-            wait(0.5).
-            release().
-            perform();
-  },
-
   /**
    * Restart the homescreen then refocus on it.
    */

diff --git a/apps/homescreen/test/marionette/localization_test.js b/apps/homescreen/test/marionette/localization_test.js
@@ -37,26 +37,4 @@ marionette('Homescreen - Localization', function() {
       return !!home.getIconByName(newIconName);
     });
   });
-
-  test('Menu option localization', function() {
-    // Change the language to french
-    client.switchToFrame();
-    client.executeAsyncScript(function() {
-      var req = navigator.mozSettings.createLock().set({
-        'language.current': 'qps-ploc'
-      });
-
-      req.onsuccess = function() {
-        marionetteScriptFinished();
-      };
-    });
-    client.switchToFrame(system.getHomescreenIframe());
-
-    home.openSettingsMenu();
-
-    var expected = home.l10n('cancel-action');
-    client.waitFor(function(){
-      return home.settingsDialogButtons.pop().text() === expected;
-    });
-  });
 });
diff --git a/apps/homescreen/test/unit/_index.html b/apps/homescreen/test/unit/_index.html
@@ -31,11 +31,6 @@
       <button class="action">resume-download-action</button>
       <button>cancel-action</button>
     </div>
-
-    <div id="settings" class="dialog">
-      <button class="action">homescreen-settings</button>
-      <button>cancel-action</button>
-    </div>
   </div>
 
   <div id="pages-panel">

diff --git a/apps/homescreen/test/unit/app_test.js b/apps/homescreen/test/unit/app_test.js
@@ -584,7 +584,7 @@ suite('Homescreen app', () => {
     });
 
     test('should attach events on click', () => {
-      var dialog = app.settingsDialog;
+      var dialog = app.dialogs[0];
       dialog.open = () => {};
       app.showActionDialog(dialog, null, [() => {}]);
       assert.ok(dialog.querySelector('button').onclick);
@@ -666,37 +666,6 @@ suite('Homescreen app', () => {
   });
 
   suite('App#handleEvent()', () => {
-    var showActionDialogStub;
-
-    suite('contextmenu', () => {
-      setup(function() {
-        showActionDialogStub = sinon.stub(app, 'showActionDialog',
-          (dialog, args, callbacks) => {
-            callbacks[0]();
-          });
-        app.settingsDialog = {
-          open: () => {},
-          close: () => {}
-        };
-      });
-
-      teardown(function() {
-        showActionDialogStub.restore();
-      });
-
-      test('should open a dialog', () => {
-        app.handleEvent(new CustomEvent('contextmenu'));
-        assert.isTrue(showActionDialogStub.called);
-      });
-
-      test('should attach a configure web activity to a button click', () => {
-        app.handleEvent(new CustomEvent('contextmenu'));
-        assert.isTrue(showActionDialogStub.called);
-        assert.equal(MockMozActivity.calls.length, 1);
-        assert.equal(MockMozActivity.calls[0].name, 'configure');
-      });
-    });
-
     suite('scroll', () => {
       test('should show and hide the drop shadow accordingly', () => {
         assert.isFalse(app.scrolled);
@@ -745,6 +714,7 @@ suite('Homescreen app', () => {
         assert.isTrue(showActionDialogStub.called);
         var stubCall = showActionDialogStub.getCall(0);
         assert.equal(stubCall.args[0], app.cancelDownload);
+        showActionDialogStub.restore();
       });
 
       suite('error and paused', () => {
@@ -759,6 +729,10 @@ suite('Homescreen app', () => {
             { detail: { target: icon } }));
         };
 
+        teardown(() => {
+          showActionDialogStub.restore();
+        });
+
         test('error app should open a resume download dialog', () => {
           testApp('error');
           assert.isTrue(showActionDialogStub.called);