author | Brian Warner <warner@mozilla.com> |
Tue, 17 Dec 2013 17:59:55 -0800 | |
changeset 161505 | 755f7983b4e27cd63717a4d50299762ab7242d73 |
parent 161504 | 5663a2789f97da77b3f51774fc8d737e7257c0c5 |
child 161506 | 882f69c9cadc20b1633ee843ddedc21c24213018 |
push id | 25884 |
push user | ttaubert@mozilla.com |
push date | Sat, 21 Dec 2013 00:37:32 +0000 |
treeherder | mozilla-central@b3d4af4ec2df [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ckarlof |
bugs | 949699 |
milestone | 29.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/base/content/aboutaccounts/aboutaccounts.js +++ b/browser/base/content/aboutaccounts/aboutaccounts.js @@ -51,22 +51,23 @@ let wrapper = { * @param accountData the user's account data and credentials */ onLogin: function (accountData) { log("Received: 'login'. Data:" + JSON.stringify(accountData)); fxAccounts.setSignedInUser(accountData).then( () => { this.injectData("message", { status: "login" }); - // until we sort out a better UX, we open the sync-progress page. - // We currently do it on a timeout as a concession to the tests, so - // it has time to act on our "login" message. - setTimeout(function() { - window.location = "about:sync-progress"; - }, 0); + // until we sort out a better UX, just leave the jelly page in place. + // If the account email is not yet verified, it will tell the user to + // go check their email, but then it will *not* change state after + // the verification completes (the browser will begin syncing, but + // won't notify the user). If the email has already been verified, + // the jelly will say "Welcome! You are successfully signed in as + // EMAIL", but it won't then say "syncing started". }, (err) => this.injectData("message", { status: "error", error: err }) ); }, /** * onSessionStatus sends the currently signed in user's credentials * to the jelly.