summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chrome/content/accountWizard/accountWizard.js2
-rw-r--r--chrome/content/accountWizard/accountWizard.xul4
-rw-r--r--chrome/content/accountWizard/createInBackend.js10
-rw-r--r--install.rdf.template4
4 files changed, 12 insertions, 8 deletions
diff --git a/chrome/content/accountWizard/accountWizard.js b/chrome/content/accountWizard/accountWizard.js
index cdd02f0..b04b2a9 100644
--- a/chrome/content/accountWizard/accountWizard.js
+++ b/chrome/content/accountWizard/accountWizard.js
@@ -589,7 +589,7 @@ BitmaskAccountWizard.prototype =
{ id: "next_button", action: makeCallback(this, this.onNext) },
{ id: "create_button", action: makeCallback(this, this.onCreate) },
];
- for each (let button in buttons) {
+ for (let button of buttons) {
button.e = e(button.id);
if (button.e.hidden || button.e.disabled) {
continue;
diff --git a/chrome/content/accountWizard/accountWizard.xul b/chrome/content/accountWizard/accountWizard.xul
index 2ffbffc..681817d 100644
--- a/chrome/content/accountWizard/accountWizard.xul
+++ b/chrome/content/accountWizard/accountWizard.xul
@@ -21,7 +21,7 @@
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="autoconfigWizard"
windowtype="mail:autoconfig"
- title="&autoconfigWizard.title;"
+ title="&autoconfigWizard2.title;"
onload="gBitmaskAccountWizard.onLoad();"
onkeypress="gBitmaskAccountWizard.onKeyDown(event)"
onclose="gBitmaskAccountWizard.onWizardShutdown();"
@@ -100,7 +100,7 @@
control="email"/>
<textbox id="email"
class="padded uri-element"
- placeholder="&email.placeholder;"
+ placeholder="&email2.placeholder;"
oninput="gBitmaskAccountWizard.onInputEmail();"
onblur="gBitmaskAccountWizard.onBlurEmail();"/>
<hbox>
diff --git a/chrome/content/accountWizard/createInBackend.js b/chrome/content/accountWizard/createInBackend.js
index 46dbbae..ed2424b 100644
--- a/chrome/content/accountWizard/createInBackend.js
+++ b/chrome/content/accountWizard/createInBackend.js
@@ -218,7 +218,7 @@ function doNotCache(inServer)
inServerQI.offlineDownload = false;
// and remove offline flag from all folders
var allFolders = inServer.rootFolder.descendants;
- for (let folder in fixIterator(allFolders, Components.interfaces.nsIMsgFolder))
+ for (let folder of fixIterator(allFolders, Components.interfaces.nsIMsgFolder))
folder.clearFlag(Components.interfaces.nsMsgFolderFlags.Offline);
}
@@ -236,8 +236,12 @@ function rememberPassword(server, password)
login.init(passwordURI, null, passwordURI, server.username, password, "", "");
try {
Services.logins.addLogin(login);
- } catch (e if e.message.includes("This login already exists")) {
- // TODO modify
+ } catch (e) {
+ if (e.message.includes("This login already exists")) {
+ // TODO modify
+ } else {
+ throw e;
+ }
}
}
diff --git a/install.rdf.template b/install.rdf.template
index bbdeab3..9d7c44f 100644
--- a/install.rdf.template
+++ b/install.rdf.template
@@ -35,8 +35,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<em:targetApplication>
<Description>
<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
- <em:minVersion>24.0</em:minVersion>
- <em:maxVersion>31.*</em:maxVersion>
+ <em:minVersion>52.0</em:minVersion>
+ <em:maxVersion>60.0</em:maxVersion>
</Description>
</em:targetApplication>
<em:localized>