author | Philipp von Weitershausen <philipp@weitershausen.de> |
Thu, 14 Oct 2010 11:12:52 +0200 | |
changeset 55767 | ad0a0be8be7415f1b8917afe1830e707ba193122 |
parent 55766 | 2c19083023fe1650c505235d4e8e7b640c771d39 |
child 55768 | bebe4e0ed795cabd6988f47af3a6e94dea1ad5d9 |
push id | 16274 |
push user | pweitershausen@mozilla.com |
push date | Thu, 14 Oct 2010 09:28:41 +0000 |
treeherder | mozilla-central@ad0a0be8be74 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mconnor, blocking-beta8 |
bugs | 600589 |
milestone | 2.0b8pre |
first release with | nightly linux32
ad0a0be8be74
/
4.0b8pre
/
20101014025815
/
files
nightly linux64
ad0a0be8be74
/
4.0b8pre
/
20101014030656
/
files
nightly mac
ad0a0be8be74
/
4.0b8pre
/
20101014030413
/
files
nightly win32
ad0a0be8be74
/
4.0b8pre
/
20101014041748
/
files
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
releases | nightly linux32
4.0b8pre
/
20101014025815
/
pushlog to previous
nightly linux64
4.0b8pre
/
20101014030656
/
pushlog to previous
nightly mac
4.0b8pre
/
20101014030413
/
pushlog to previous
nightly win32
4.0b8pre
/
20101014041748
/
pushlog to previous
|
browser/base/content/syncGenericChange.js | file | annotate | diff | comparison | revisions | |
browser/base/content/syncGenericChange.xul | file | annotate | diff | comparison | revisions |
--- a/browser/base/content/syncGenericChange.js +++ b/browser/base/content/syncGenericChange.js @@ -142,22 +142,26 @@ let Change = { this._statusIcon.removeAttribute("status"); }, _updateStatus: function Change__updateStatus(str, state) { this._updateStatusWithString(this._str(str), state); }, _updateStatusWithString: function Change__updateStatusWithString(string, state) { + this._statusRow.hidden = false; + document.getElementById("passphraseStrengthRow").hidden = true; this._status.value = string; this._statusIcon.setAttribute("status", state); let error = state == "error"; this._dialog.getButton("cancel").setAttribute("disabled", !error); this._dialog.getButton("accept").setAttribute("disabled", !error); + document.getElementById("printSyncKeyButton").disabled = !error; + document.getElementById("saveSyncKeyButton").disabled = !error; if (state == "success") window.setTimeout(window.close, 1500); }, onDialogAccept: function() { switch (this._dialogType) { case "UpdatePassphrase":
--- a/browser/base/content/syncGenericChange.xul +++ b/browser/base/content/syncGenericChange.xul @@ -130,20 +130,22 @@ onclick="event.stopPropagation(); gSyncUtils.openSyncKeyHelp();" value="&syncKeyHelp.label;"/> </hbox> </vbox> </vbox> <hbox id="passphraseBackupButtons" pack="center"> - <button label="&button.syncKeyBackup.print.label;" + <button id="printSyncKeyButton" + label="&button.syncKeyBackup.print.label;" accesskey="&button.syncKeyBackup.print.accesskey;" oncommand="gSyncUtils.passphrasePrint('passphraseBox');"/> - <button label="&button.syncKeyBackup.save.label;" + <button id="saveSyncKeyButton" + label="&button.syncKeyBackup.save.label;" accesskey="&button.syncKeyBackup.save.accesskey;" oncommand="gSyncUtils.passphraseSave('passphraseBox');"/> </hbox> <description> <html:p class="data" id="warningText"/> </description> </vbox>