Bug 962588 - Fix AboutFlyoutPanel upPanel updateDeck elements to layout and wrap contents correctly. r=mbrubeck

This commit is contained in:
Sam Foster 2014-01-27 13:36:06 -08:00
parent 1042c6efea
commit c5774ff5a4
2 changed files with 15 additions and 9 deletions

View File

@ -400,28 +400,34 @@ Desktop browser's sync prefs.
<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>

View File

@ -506,7 +506,7 @@ appUpdater.prototype =
*/
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);
@ -598,7 +598,7 @@ appUpdater.prototype =
* See nsIProgressEventSink.idl
*/
onProgress: function(aRequest, aContext, aProgress, aProgressMax) {
this.downloadStatus.value =
this.downloadStatus.textContent =
DownloadUtils.getTransferTotal(aProgress, aProgressMax);
},