Merge pull request #328 from mykmelez/release-3.0pre1

update version for 3.0pre1 release

addon/data/content/index.html

@@ -41,7 +41,9 @@ <h5>
                       <span id="commands-preference-default-app"></span>
                     </label>
                 </fieldset>
-                <h5 id="device-status"><img src="device.png" alt="Device"> Device connected.</h5>
+                <h5 id="device-status" style="opacity: 0">
+                    <img src="device.png" alt="Device"> Device connected.
+                </h5>
                 <nav>
                     <ul>
                         <li><a href="#dashboard">Dashboard</a></li>

addon/data/content/js/main.js

@@ -165,6 +165,7 @@ var Simulator = {
                   $("<button>")
                     .addClass("pushButton")
                     .append("<img src='device.png' height='14'> Push")
+                    .css("opacity", Simulator.deviceConnected ? 1 : 0)
                     .click(function(evt) {
                       window.postMessage({ name: "pushAppToDevice", id: id }, "*");
                     })
@@ -228,19 +229,14 @@ var Simulator = {
               // FIXME: Make an actual list, add a template engine
               container.append(entry);
             });
-
-            // Now that we have the list of apps, we check if a device
-            // is connected so we know whether or not to enable the Push buttons
-            // for each app (and the overall "device connected" indicator).
-            window.postMessage({ name: "getDeviceConnected" }, "*");
-
             break;
         }
       },
       false
     );
 
     window.postMessage({ name: "getIsRunning" }, "*");
+    window.postMessage({ name: "getDeviceConnected" }, "*");
     // Clears removed apps on reload
     window.postMessage({ name: "listApps", flush: true }, "*");
     window.postMessage({ name: "listTabs" }, "*");

addon/package.json

@@ -1,7 +1,7 @@
 {
   "id": "r2d2b2g@mozilla.org",
   "name": "r2d2b2g",
-  "version": "3.0pre1dev",
+  "version": "3.0pre2dev",
   "fullName": "Firefox OS Simulator",
   "description": "a Firefox OS simulator",
   "author": "Myk Melez (https://github.com/mykmelez)",