Merge pull request mozilla-b2g#33379 from gasolin/issue-1228252

Bug 1228252 - move openDialog from util.js to panel_utils, r=yzen
evelynhung · Nov 27, 2015 · e6d4fb1 · e6d4fb1
2 parents ffd62f1 + aa35773
commit e6d4fb1
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 41 deletions.
diff --git a/apps/settings/js/modules/panel_utils.js b/apps/settings/js/modules/panel_utils.js
@@ -1,4 +1,4 @@
-/* global openLink, openDialog */
+/* global openLink */
 /**
  * PanelUtils is a singleton that defines panel related utility functions.
  *
@@ -13,6 +13,44 @@ define(function(require) {
 
   var _settings = navigator.mozSettings;
 
+  /**
+   * These so-called "dialog boxes" are just standard Settings panels
+   * (<section role="region" />) with reset/submit buttons: these buttons both
+   * return to the previous panel when clicked, and each button has its own
+   * (optional) callback.
+   */
+  function openDialog(dialogID, onSubmit, onReset) {
+    if ('#' + dialogID === Settings.currentPanel) {
+      return;
+    }
+
+    var origin = Settings.currentPanel;
+
+    // Load dialog contents and show it.
+    Settings.currentPanel = dialogID;
+
+    var dialog = document.getElementById(dialogID);
+    var submit = dialog.querySelector('[type=submit]');
+    if (submit) {
+      submit.onclick = function onsubmit() {
+        if (typeof onSubmit === 'function') {
+          (onSubmit.bind(dialog))();
+        }
+        Settings.currentPanel = origin; // hide dialog box
+      };
+    }
+
+    var reset = dialog.querySelector('[type=reset]');
+    if (reset) {
+      reset.onclick = function onreset() {
+        if (typeof onReset === 'function') {
+          (onReset.bind(dialog))();
+        }
+        Settings.currentPanel = origin; // hide dialog box
+      };
+    }
+  }
+
   /**
    * Opens the dialog of a specified id.
    *

diff --git a/apps/settings/js/utils.js b/apps/settings/js/utils.js
@@ -1,5 +1,5 @@
 /* global MozActivity, LazyLoader, DsdsSettings, SupportedNetworkTypeHelper */
-/* exported reopenSettings, openLink, openDialog,
+/* exported reopenSettings, openLink,
             openIncompatibleSettingsDialog, DeviceStorageHelper,
             sanitizeAddress, getIccByIndex */
 'use strict';
@@ -34,44 +34,6 @@ function openLink(url) {
   }
 }
 
-/**
- * These so-called "dialog boxes" are just standard Settings panels (<section
- * role="region" />) with reset/submit buttons: these buttons both return to the
- * previous panel when clicked, and each button has its own (optional) callback.
- */
-
-function openDialog(dialogID, onSubmit, onReset) {
-  if ('#' + dialogID === Settings.currentPanel) {
-    return;
-  }
-
-  var origin = Settings.currentPanel;
-
-  // Load dialog contents and show it.
-  Settings.currentPanel = dialogID;
-
-  var dialog = document.getElementById(dialogID);
-  var submit = dialog.querySelector('[type=submit]');
-  if (submit) {
-    submit.onclick = function onsubmit() {
-      if (typeof onSubmit === 'function') {
-        (onSubmit.bind(dialog))();
-      }
-      Settings.currentPanel = origin; // hide dialog box
-    };
-  }
-
-  var reset = dialog.querySelector('[type=reset]');
-  if (reset) {
-    reset.onclick = function onreset() {
-      if (typeof onReset === 'function') {
-        (onReset.bind(dialog))();
-      }
-      Settings.currentPanel = origin; // hide dialog box
-    };
-  }
-}
-
 function openIncompatibleSettingsDialog(dialogId, newSetting,
   oldSetting, callback) {
   var headerL10nMap = {

diff --git a/apps/settings/test/unit/mock_settings_utils.js b/apps/settings/test/unit/mock_settings_utils.js
@@ -2,7 +2,6 @@ define(function() {
   'use strict';
 
   var MockSettingsUtils = {
-    openDialog: function(dialogID, userOptions) {},
     loadTemplate: function(templatePanelId, callback) {
       callback();
     }