summaryrefslogtreecommitdiff
path: root/chrome
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-11-19 14:32:45 -0200
committerdrebs <drebs@leap.se>2013-11-19 14:32:45 -0200
commit8138d21582cfb43fd7462560e858e71ce2c9a9c3 (patch)
tree755730882e5785f2c84525a5b9f053aeb69b3f95 /chrome
parent2a71d0c9b74c69f8c195f219a82b689685b6d110 (diff)
parent48a180fbe5a7a30b738f97942b55bc6f6039ce58 (diff)
Merge branch 'feature/4525_remove-password-field-from-wizard' into develop
Diffstat (limited to 'chrome')
-rw-r--r--chrome/content/accountWizard/accountWizard.js18
-rw-r--r--chrome/content/accountWizard/accountWizard.xul4
2 files changed, 12 insertions, 10 deletions
diff --git a/chrome/content/accountWizard/accountWizard.js b/chrome/content/accountWizard/accountWizard.js
index da49536..1e25d0f 100644
--- a/chrome/content/accountWizard/accountWizard.js
+++ b/chrome/content/accountWizard/accountWizard.js
@@ -110,7 +110,7 @@ BitmaskAccountWizard.prototype =
this._email = "";
this._realname = (userFullname) ? userFullname : "";
e("realname").value = this._realname;
- this._password = "";
+ this._password = "123"; // use any password for now
this._okCallback = null;
if (window.arguments && window.arguments[0]) {
@@ -128,11 +128,12 @@ BitmaskAccountWizard.prototype =
gBrandShortName = e("bundle_brand").getString("brandShortName");
// admin-locked prefs hurray
- if (!Services.prefs.getBoolPref("signon.rememberSignons")) {
- let rememberPasswordE = e("remember_password");
- rememberPasswordE.checked = false;
- rememberPasswordE.disabled = true;
- }
+ // we do not use password for now
+ //if (!Services.prefs.getBoolPref("signon.rememberSignons")) {
+ // let rememberPasswordE = e("remember_password");
+ // rememberPasswordE.checked = false;
+ // rememberPasswordE.disabled = true;
+ //}
// First, unhide the main window areas, and store the width,
// so that we don't resize wildly when we unhide areas.
@@ -203,8 +204,9 @@ BitmaskAccountWizard.prototype =
{
var result = this._currentConfig.copy();
replaceVariables(result, this._realname, this._email, this._password);
- result.rememberPassword = e("remember_password").checked &&
- !!this._password;
+ //result.rememberPassword = e("remember_password").checked &&
+ // !!this._password;
+ result.rememberPassword = true;
return result;
},
diff --git a/chrome/content/accountWizard/accountWizard.xul b/chrome/content/accountWizard/accountWizard.xul
index f9ff6f4..6518f83 100644
--- a/chrome/content/accountWizard/accountWizard.xul
+++ b/chrome/content/accountWizard/accountWizard.xul
@@ -108,9 +108,8 @@
<description id="emailerror" class="errordescription" hidden="true"/>
</hbox>
</row>
+ <!-- we do not use the password for now.
<row align="center">
- <!-- this starts out as text so the emptytext shows, but then
- changes to type=password once it's not empty -->
<label accesskey="&password.accesskey;"
class="autoconfigLabel"
value="&password.label;"
@@ -137,6 +136,7 @@
accesskey="&rememberPassword.accesskey;"
checked="true"/>
</row>
+ -->
</rows>
</grid>
<spacer flex="1" />