From 5b35b762b876c29371ba38ddd12847c1b31f9140 Mon Sep 17 00:00:00 2001
From: Paul Rouget <paul@mozilla.com>
Date: Thu, 24 Jul 2014 08:09:00 +0200
Subject: [PATCH] Bug 1043361 - don't hide simulator menuitem. r=jryans

---
 browser/devtools/webide/content/webide.js        | 7 -------
 browser/devtools/webide/content/webide.xul       | 2 +-
 browser/devtools/webide/locales/en-US/webide.dtd | 2 +-
 browser/devtools/webide/themes/webide.css        | 4 ++--
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/browser/devtools/webide/content/webide.js b/browser/devtools/webide/content/webide.js
index ed1b6f3d80d..2a649b0d523 100644
--- a/browser/devtools/webide/content/webide.js
+++ b/browser/devtools/webide/content/webide.js
@@ -294,7 +294,6 @@ let UI = {
 
     let noHelperNode = document.querySelector("#runtime-panel-noadbhelper");
     let noUSBNode = document.querySelector("#runtime-panel-nousbdevice");
-    let noSimulatorNode = document.querySelector("#runtime-panel-nosimulator");
 
     if (Devices.helperAddonInstalled) {
       noHelperNode.setAttribute("hidden", "true");
@@ -308,12 +307,6 @@ let UI = {
       noUSBNode.setAttribute("hidden", "true");
     }
 
-    if (AppManager.runtimeList.simulator.length > 0) {
-      noSimulatorNode.setAttribute("hidden", "true");
-    } else {
-      noSimulatorNode.removeAttribute("hidden");
-    }
-
     for (let [type, parent] of [
       ["usb", USBListNode],
       ["wifi", WiFiListNode],
diff --git a/browser/devtools/webide/content/webide.xul b/browser/devtools/webide/content/webide.xul
index 30004c6f922..5763089c187 100644
--- a/browser/devtools/webide/content/webide.xul
+++ b/browser/devtools/webide/content/webide.xul
@@ -154,8 +154,8 @@
         <label class="panel-header" id="runtime-header-wifi-devices">&runtimePanel_WiFiDevices;</label>
         <vbox id="runtime-panel-wifi-devices"></vbox>
         <label class="panel-header">&runtimePanel_simulators;</label>
-        <toolbarbutton class="panel-item" label="&runtimePanel_nosimulator;" id="runtime-panel-nosimulator" command="cmd_showAddons"/>
         <vbox id="runtime-panel-simulators"></vbox>
+        <toolbarbutton class="panel-item" label="&runtimePanel_installsimulator;" id="runtime-panel-installsimulator" command="cmd_showAddons"/>
         <label class="panel-header">&runtimePanel_custom;</label>
         <vbox id="runtime-panel-custom"></vbox>
         <vbox flex="1" id="runtime-actions">
diff --git a/browser/devtools/webide/locales/en-US/webide.dtd b/browser/devtools/webide/locales/en-US/webide.dtd
index 95febb99dd2..af0c4acab90 100644
--- a/browser/devtools/webide/locales/en-US/webide.dtd
+++ b/browser/devtools/webide/locales/en-US/webide.dtd
@@ -64,7 +64,7 @@
 <!ENTITY runtimePanel_WiFiDevices "WiFi Devices">
 <!ENTITY runtimePanel_simulators "Simulators">
 <!ENTITY runtimePanel_custom "Custom">
-<!ENTITY runtimePanel_nosimulator "Install Simulator">
+<!ENTITY runtimePanel_installsimulator "Install Simulator">
 <!ENTITY runtimePanel_noadbhelper "Install ADB Helper">
 <!ENTITY runtimePanel_nousbdevice "Can't see your device?">
 
diff --git a/browser/devtools/webide/themes/webide.css b/browser/devtools/webide/themes/webide.css
index e22383de5cc..d925d3285c4 100644
--- a/browser/devtools/webide/themes/webide.css
+++ b/browser/devtools/webide/themes/webide.css
@@ -206,7 +206,7 @@ panel > .panel-arrowcontainer > .panel-arrowcontent {
 #runtime-disconnect,
 #runtime-panel-nousbdevice,
 #runtime-panel-noadbhelper,
-#runtime-panel-nosimulator,
+#runtime-panel-installsimulator,
 .runtime-panel-item-usb,
 .runtime-panel-item-wifi,
 .runtime-panel-item-custom,
@@ -220,7 +220,7 @@ panel > .panel-arrowcontainer > .panel-arrowcontent {
 #runtime-disconnect             { -moz-image-region: rect(52px,338px,78px,312px) }
 #runtime-panel-nousbdevice      { -moz-image-region: rect(156px,338px,182px,312px) }
 #runtime-panel-noadbhelper      { -moz-image-region: rect(234px,338px,260px,312px) }
-#runtime-panel-nosimulator      { -moz-image-region: rect(0px,338px,26px,312px) }
+#runtime-panel-installsimulator { -moz-image-region: rect(0px,338px,26px,312px) }
 .runtime-panel-item-usb         { -moz-image-region: rect(52px,338px,78px,312px) }
 .runtime-panel-item-wifi        { -moz-image-region: rect(208px,338px,234px,312px) }
 .runtime-panel-item-custom      { -moz-image-region: rect(26px,338px,52px,312px) }