Bug 675823 - Part 3: Adjust mobile easy setup flow to show waiting message. r=rnewman

This commit is contained in:
Philipp von Weitershausen 2011-10-02 01:16:37 -07:00
parent f87a9c000b
commit 7376fdcdcc
4 changed files with 13 additions and 1 deletions

View File

@ -584,6 +584,9 @@
<button class="prompt-button" oncommand="WeaveGlue.close();">&sync.setup.cancel;</button>
</hbox>
</vbox>
<vbox id="syncsetup-waiting" class="syncsetup-page" flex="1" hidden="true">
<description class="syncsetup-desc syncsetup-center" flex="1">&sync.setup.waiting;</description>
</vbox>
<vbox id="syncsetup-fallback" class="syncsetup-page" flex="1" hidden="true">
<scrollbox class="prompt-message" orient="vertical" flex="1">
<description class="syncsetup-desc syncsetup-center" flex="1">&sync.setup.manual;</description>

View File

@ -108,6 +108,7 @@ let WeaveGlue = {
// Show the connect UI
container.hidden = false;
document.getElementById("syncsetup-simple").hidden = false;
document.getElementById("syncsetup-waiting").hidden = true;
document.getElementById("syncsetup-fallback").hidden = true;
BrowserUI.pushDialog(this);
@ -120,7 +121,10 @@ let WeaveGlue = {
document.getElementById("syncsetup-code3").value = aPin.slice(8);
},
onPairingStart: function onPairingStart() {},
onPairingStart: function onPairingStart() {
document.getElementById("syncsetup-simple").hidden = true;
document.getElementById("syncsetup-waiting").hidden = false;
},
onComplete: function onComplete(aCredentials) {
self.jpake = null;

View File

@ -19,3 +19,4 @@
<!ENTITY sync.setup.connect "Connect">
<!ENTITY sync.setup.cancel "Cancel">
<!ENTITY sync.setup.tutorial "Show me how">
<!ENTITY sync.setup.waiting "Pairing in progress…">

View File

@ -1533,6 +1533,10 @@ setting {
padding-bottom: 2em;
}
#syncsetup-waiting {
padding: 10em 0;
}
/* content scrollbars */
.scroller {
opacity: 0;