Bug 620593 - Username should allow leading and trailing whitespace. r=philikon a=mconnor

This commit is contained in:
Richard Newman 2011-02-03 10:53:59 -08:00
parent 5d496cfd77
commit 801d1bf75e

View File

@ -23,6 +23,7 @@
* Mike Connor <mconnor@mozilla.com> * Mike Connor <mconnor@mozilla.com>
* Philipp von Weitershausen <philipp@weitershausen.de> * Philipp von Weitershausen <philipp@weitershausen.de>
* Paul OShannessy <paul@oshannessy.com> * Paul OShannessy <paul@oshannessy.com>
* Richard Newman <rnewman@mozilla.com>
* *
* Alternatively, the contents of this file may be used under the terms of * Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or * either the GNU General Public License Version 2 or later (the "GPL"), or
@ -248,7 +249,8 @@ var gSyncSetup = {
checkAccount: function() { checkAccount: function() {
delete this._checkAccountTimer; delete this._checkAccountTimer;
let value = document.getElementById("weaveEmail").value; let value = Weave.Utils.normalizeAccount(
document.getElementById("weaveEmail").value);
if (!value) { if (!value) {
this.status.email = false; this.status.email = false;
this.checkFields(); this.checkFields();
@ -415,7 +417,8 @@ var gSyncSetup = {
feedback.hidden = false; feedback.hidden = false;
let password = document.getElementById("weavePassword").value; let password = document.getElementById("weavePassword").value;
let email = document.getElementById("weaveEmail").value; let email = Weave.Utils.normalizeAccount(
document.getElementById("weaveEmail").value);
let challenge = getField("challenge"); let challenge = getField("challenge");
let response = getField("response"); let response = getField("response");
@ -440,7 +443,8 @@ var gSyncSetup = {
this.captchaBrowser.loadURI(Weave.Service.miscAPI + "captcha_html"); this.captchaBrowser.loadURI(Weave.Service.miscAPI + "captcha_html");
break; break;
case EXISTING_ACCOUNT_LOGIN_PAGE: case EXISTING_ACCOUNT_LOGIN_PAGE:
Weave.Service.account = document.getElementById("existingAccountName").value; Weave.Service.account = Weave.Utils.normalizeAccount(
document.getElementById("existingAccountName").value);
Weave.Service.password = document.getElementById("existingPassword").value; Weave.Service.password = document.getElementById("existingPassword").value;
let pp = document.getElementById("existingPassphrase").value; let pp = document.getElementById("existingPassphrase").value;
Weave.Service.passphrase = Weave.Utils.normalizePassphrase(pp); Weave.Service.passphrase = Weave.Utils.normalizePassphrase(pp);