Merge branch 'feature/4525_remove-password-field-from-wizard' into develop

4 files changed, 14 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index fb59643..d331e5b 100755
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ RSA_FILE := META-INF/zigbert.rsa
 
 # the following variables are updated automatically
 COMMIT   := $(shell git --no-pager log -1 --format=format:%h)
-VERSION = $(shell head -n1 Changelog | sed -e 's/^.*(//' -e 's/).*$$//')
+VERSION = $(shell head -n1 CHANGELOG | cut -d" " -f1)
 PKGNAME  := $(EXTNAME)-$(VERSION)-$(COMMIT).xpi
 TARGET   := $(CURDIR)/build/$(PKGNAME)
 TEMPDIR  := $(shell mktemp -d -u)
diff --git a/changes/feature_4525_remove-password-field-from-wizard b/changes/feature_4525_remove-password-field-from-wizard
new file mode 100644
index 0000000..fbb1376
--- /dev/null
+++ b/changes/feature_4525_remove-password-field-from-wizard
@@ -0,0 +1 @@
+  o Remove the password field from the account wizard. Closes #4525.
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" />