Bug 1156834 - Enable Simulator configuration screen by default in WebIDE. r=jryans
authorJan Keromnes <janx@linux.com>
Thu, 02 Jul 2015 08:35:00 -0400
changeset 251263 76a9b5ea3eadd2d0cb831a248ec09df85d955965
parent 251262 2e72154c2c40290db116d28d3d1abc29a6e99365
child 251264 663108a1d580c00a51335d6a1060006788cee438
push id61806
push userkwierso@gmail.com
push dateFri, 03 Jul 2015 00:29:54 +0000
treeherdermozilla-inbound@0bad42d89c72 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjryans
bugs1156834
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1156834 - Enable Simulator configuration screen by default in WebIDE. r=jryans
browser/devtools/webide/content/webide.js
browser/devtools/webide/modules/runtime-list.js
browser/devtools/webide/test/head.js
browser/devtools/webide/webide-prefs.js
--- a/browser/devtools/webide/content/webide.js
+++ b/browser/devtools/webide/content/webide.js
@@ -715,20 +715,16 @@ let UI = {
       }).then(null, console.error);
     }, console.error);
   },
 
   isProjectEditorEnabled: function() {
     return Services.prefs.getBoolPref("devtools.webide.showProjectEditor");
   },
 
-  isRuntimeConfigurationEnabled: function() {
-    return Services.prefs.getBoolPref("devtools.webide.enableRuntimeConfiguration");
-  },
-
   openProject: function() {
     let project = AppManager.selectedProject;
 
     // Nothing to show
 
     if (!project) {
       this.resetDeck();
       return;
--- a/browser/devtools/webide/modules/runtime-list.js
+++ b/browser/devtools/webide/modules/runtime-list.js
@@ -200,17 +200,17 @@ RuntimeList.prototype = {
           if (!this._sidebarsEnabled) {
             this._UI.hidePanels();
           }
           this._UI.dismissErrorNotification();
           this._UI.connectToRuntime(r);
         }, true);
         panelItemNode.appendChild(connectButton);
 
-        if (r.configure && this._UI.isRuntimeConfigurationEnabled()) {
+        if (r.configure) {
           let configButton = doc.createElement(this._panelNodeEl);
           configButton.className = "configure-button";
           configButton.addEventListener("click", r.configure.bind(r), true);
           panelItemNode.appendChild(configButton);
         }
 
         parent.appendChild(panelItemNode);
       }
--- a/browser/devtools/webide/test/head.js
+++ b/browser/devtools/webide/test/head.js
@@ -21,17 +21,16 @@ let TEST_BASE;
 if (window.location === "chrome://browser/content/browser.xul") {
   TEST_BASE = "chrome://mochitests/content/browser/browser/devtools/webide/test/";
 } else {
   TEST_BASE = "chrome://mochitests/content/chrome/browser/devtools/webide/test/";
 }
 
 Services.prefs.setBoolPref("devtools.webide.enabled", true);
 Services.prefs.setBoolPref("devtools.webide.enableLocalRuntime", true);
-Services.prefs.setBoolPref("devtools.webide.enableRuntimeConfiguration", true);
 
 Services.prefs.setCharPref("devtools.webide.addonsURL", TEST_BASE + "addons/simulators.json");
 Services.prefs.setCharPref("devtools.webide.simulatorAddonsURL", TEST_BASE + "addons/fxos_#SLASHED_VERSION#_simulator-#OS#.xpi");
 Services.prefs.setCharPref("devtools.webide.adbAddonURL", TEST_BASE + "addons/adbhelper-#OS#.xpi");
 Services.prefs.setCharPref("devtools.webide.adaptersAddonURL", TEST_BASE + "addons/fxdt-adapters-#OS#.xpi");
 Services.prefs.setCharPref("devtools.webide.templatesURL", TEST_BASE + "templates.json");
 Services.prefs.setCharPref("devtools.devices.url", TEST_BASE + "browser_devices.json");
 
--- a/browser/devtools/webide/webide-prefs.js
+++ b/browser/devtools/webide/webide-prefs.js
@@ -5,17 +5,16 @@
 
 pref("devtools.webide.showProjectEditor", true);
 pref("devtools.webide.templatesURL", "https://code.cdn.mozilla.net/templates/list.json");
 pref("devtools.webide.autoinstallADBHelper", true);
 pref("devtools.webide.autoinstallFxdtAdapters", true);
 pref("devtools.webide.autoConnectRuntime", true);
 pref("devtools.webide.restoreLastProject", true);
 pref("devtools.webide.enableLocalRuntime", false);
-pref("devtools.webide.enableRuntimeConfiguration", false);
 pref("devtools.webide.addonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/index.json");
 pref("devtools.webide.simulatorAddonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/#VERSION#/#OS#/fxos_#SLASHED_VERSION#_simulator-#OS#-latest.xpi");
 pref("devtools.webide.simulatorAddonID", "fxos_#SLASHED_VERSION#_simulator@mozilla.org");
 pref("devtools.webide.simulatorAddonRegExp", "fxos_(.*)_simulator@mozilla\\.org$");
 pref("devtools.webide.adbAddonURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/adb-helper/#OS#/adbhelper-#OS#-latest.xpi");
 pref("devtools.webide.adbAddonID", "adbhelper@mozilla.org");
 pref("devtools.webide.adaptersAddonURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/valence/#OS#/valence-#OS#-latest.xpi");
 pref("devtools.webide.adaptersAddonID", "fxdevtools-adapters@mozilla.org");