Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 12:09:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve issue #130

Browse source
This commit is contained in:
djmaze 2021-08-26 20:31:38 +02:00
parent 637ed9a478
commit c8678953fe
3 changed files with 137 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

46
dev/View/Popup/Domain.js
View file

@ -80,8 +80,6 @@ class DomainPopupView extends AbstractViewPopup {
testingSieveError: value => value || this.testingSieveErrorDesc(''),
testingSmtpError: value => value || this.testingSmtpErrorDesc(''),
page: () => this.sieveSettings(false),
// smart form improvements
imapServerFocus: value =>
value && this.name() && !this.imapServer() && this.imapServer(this.name().replace(/[.]?[*][.]?/g, '')),
@ -139,10 +137,7 @@ class DomainPopupView extends AbstractViewPopup {
decorateKoCommands(this, {
createOrAddCommand: self => self.canBeSaved(),
testConnectionCommand: self => self.canBeTested(),
whiteListCommand: 1,
backCommand: 1,
sieveCommand: 1
testConnectionCommand: self => self.canBeTested()
});
}
@ -155,8 +150,6 @@ class DomainPopupView extends AbstractViewPopup {
}
testConnectionCommand() {
this.page('main');
this.testingDone(false);
this.testingImapError(false);
this.testingSieveError(false);
@ -170,24 +163,18 @@ class DomainPopupView extends AbstractViewPopup {
this.testingImapError(true);
this.testingSieveError(true);
this.testingSmtpError(true);
this.sieveSettings(false);
} else {
let bImap = false,
bSieve = false;
this.testingDone(true);
this.testingImapError(true !== oData.Result.Imap);
this.testingSieveError(true !== oData.Result.Sieve);
this.testingSmtpError(true !== oData.Result.Smtp);
if (this.testingImapError() && oData.Result.Imap) {
bImap = true;
this.testingImapErrorDesc('');
this.testingImapErrorDesc(oData.Result.Imap);
}
if (this.testingSieveError() && oData.Result.Sieve) {
bSieve = true;
this.testingSieveErrorDesc('');
this.testingSieveErrorDesc(oData.Result.Sieve);
}
@ -196,33 +183,12 @@ class DomainPopupView extends AbstractViewPopup {
this.testingSmtpErrorDesc('');
this.testingSmtpErrorDesc(oData.Result.Smtp);
}
if (this.sieveSettings()) {
if (!bSieve && bImap) {
this.sieveSettings(false);
}
} else if (bSieve && !bImap) {
this.sieveSettings(true);
}
}
},
this
);
}
whiteListCommand() {
this.page('white-list');
}
backCommand() {
this.page('main');
}
sieveCommand() {
this.sieveSettings(!this.sieveSettings());
this.clearTesting();
}
onDomainCreateOrSaveResponse(iError) {
this.saving(false);
if (iError) {
@ -241,17 +207,9 @@ class DomainPopupView extends AbstractViewPopup {
this.testingSmtpError(false);
}
onHide() {
this.page('main');
this.sieveSettings(false);
}
onShow(oDomain) {
this.saving(false);
this.page('main');
this.sieveSettings(false);
this.clearTesting();
this.clearForm();
@ -286,8 +244,6 @@ class DomainPopupView extends AbstractViewPopup {
getDefaults() {
return {
savingError: '',
page: 'main',
sieveSettings: false,
name: '',