Bug 962588 - Fix AboutFlyoutPanel upPanel updateDeck elements to layout and wrap contents correctly. r=mbrubeck a=metro-only
authorSam Foster <sfoster@mozilla.com>
Mon, 27 Jan 2014 13:36:06 -0800
changeset 176107 efa507a8e34e0f4008beaf996a350d35e589fc2b
parent 176106 fb2b1405f49374cf0651d9a77ba02afb9e33aed3
child 176108 095aa30cb6ef6a6772808db30e4ec3685a2d7d76
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmbrubeck, metro-only
bugs962588
milestone28.0a2
Bug 962588 - Fix AboutFlyoutPanel upPanel updateDeck elements to layout and wrap contents correctly. r=mbrubeck a=metro-only
browser/metro/base/content/browser.xul
browser/metro/base/content/flyoutpanels/AboutFlyoutPanel.js
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -395,38 +395,44 @@ Desktop browser's sync prefs.
 #ifdef MOZ_UPDATER
         <deck id="updateDeck" orient="vertical">
           <hbox id="updateButtonBox" align="center">
             <button id="updateButton" align="start"
                     oncommand="FlyoutPanelsUI.AboutFlyoutPanel.appUpdater.buttonOnCommand();"/>
             <spacer flex="1"/>
           </hbox>
           <hbox id="checkingForUpdates" align="center">
-            <image class="update-throbber"/><label>&update.checkingForUpdates;</label>
+            <image class="update-throbber"/>
+            <description flex="1">&update.checkingForUpdates;</description>
           </hbox>
           <hbox id="checkingAddonCompat" align="center">
-            <image class="update-throbber"/><label>&update.checkingAddonCompat;</label>
+            <image class="update-throbber"/>
+            <description flex="1">&update.checkingAddonCompat;</description>
           </hbox>
           <hbox id="downloading" align="center">
-            <image class="update-throbber"/><label>&update.downloading.start;</label><label id="downloadStatus"/><label>&update.downloading.end;</label>
+            <image class="update-throbber"/>
+            <description flex="1">
+              &update.downloading.start;<html:span id="downloadStatus"></html:span>&update.downloading.end;
+            </description>
           </hbox>
           <hbox id="applying" align="center">
-            <image class="update-throbber"/><label>&update.applying;</label>
+            <image class="update-throbber"/>
+            <description flex="1">&update.applying;</description>
           </hbox>
           <hbox id="downloadFailed" align="center">
             <label>&update.failed.start;</label><label id="failedLink" class="text-link">&update.failed.linkText;</label><label>&update.failed.end;</label>
           </hbox>
           <hbox id="adminDisabled" align="center">
-            <label>&update.adminDisabled;</label>
+            <label linewrap="true">&update.adminDisabled;</label>
           </hbox>
           <hbox id="noUpdatesFound" align="center">
-            <label>&update.noUpdatesFound;</label>
+            <label linewrap="true">&update.noUpdatesFound;</label>
           </hbox>
           <hbox id="otherInstanceHandlingUpdates" align="center">
-            <label>&update.otherInstanceHandlingUpdates;</label>
+            <label linewrap="true">&update.otherInstanceHandlingUpdates;</label>
           </hbox>
           <hbox id="manualUpdate" align="center">
             <label>&update.manual.start;</label><label id="manualLink" linewrap="true" class="text-link"/><label>&update.manual.end;</label>
           </hbox>
         </deck>
 #endif
       </vbox>
 #if MOZ_UPDATE_CHANNEL != release
--- a/browser/metro/base/content/flyoutpanels/AboutFlyoutPanel.js
+++ b/browser/metro/base/content/flyoutpanels/AboutFlyoutPanel.js
@@ -501,17 +501,17 @@ appUpdater.prototype =
     this.setupDownloadingUI();
   },
 
   /**
    * Switches to the UI responsible for tracking the download.
    */
   setupDownloadingUI: function() {
     this.downloadStatus = document.getElementById("downloadStatus");
-    this.downloadStatus.value =
+    this.downloadStatus.textContent =
       DownloadUtils.getTransferTotal(0, this.update.selectedPatch.size);
     this.selectPanel("downloading");
     this.aus.addDownloadListener(this);
   },
 
   removeDownloadListener: function() {
     if (this.aus) {
       this.aus.removeDownloadListener(this);
@@ -593,17 +593,17 @@ appUpdater.prototype =
    */
   onStatus: function(aRequest, aContext, aStatus, aStatusArg) {
   },
 
   /**
    * See nsIProgressEventSink.idl
    */
   onProgress: function(aRequest, aContext, aProgress, aProgressMax) {
-    this.downloadStatus.value =
+    this.downloadStatus.textContent =
       DownloadUtils.getTransferTotal(aProgress, aProgressMax);
   },
 
   /**
    * See nsISupports.idl
    */
   QueryInterface: function(aIID) {
     if (!aIID.equals(Components.interfaces.nsIProgressEventSink) &&