Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 16:37:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup user login JavaScript code

Browse source
This commit is contained in:
djmaze 2021-07-23 11:57:45 +02:00
parent 0a69c6410d
commit 56e8ea664d
1 changed files with 16 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

45
dev/View/User/Login.js
View file

@ -16,18 +16,9 @@ import { AbstractViewCenter } from 'Knoin/AbstractViews';
import { LanguagesPopupView } from 'View/Popup/Languages'; import { LanguagesPopupView } from 'View/Popup/Languages';
const const SignMeOff = 0,
LoginSignMeType = { SignMeOn = 1,
DefaultOff: 0, SignMeUnused = 2;
DefaultOn: 1,
Unused: 2
},
LoginSignMeTypeAsString = {
DefaultOff: 'defaultoff',
DefaultOn: 'defaulton',
Unused: 'unused'
};
class LoginUserView extends AbstractViewCenter { class LoginUserView extends AbstractViewCenter {
@ -52,7 +43,7 @@ class LoginUserView extends AbstractViewCenter {
langRequest: false, langRequest: false,
signMeType: LoginSignMeType.Unused signMeType: SignMeUnused
}); });
this.formError = ko.observable(false).extend({ falseTimeout: 500 }); this.formError = ko.observable(false).extend({ falseTimeout: 500 });
@ -68,19 +59,17 @@ class LoginUserView extends AbstractViewCenter {
languageFullName: () => convertLangName(this.language()), languageFullName: () => convertLangName(this.language()),
signMeVisibility: () => LoginSignMeType.Unused !== this.signMeType() signMeVisibility: () => SignMeUnused !== this.signMeType()
}); });
this.addSubscribables({ this.addSubscribables({
email: () => { email: () => this.emailError(false),
this.emailError(false);
},
password: () => this.passwordError(false), password: () => this.passwordError(false),
submitError: value => value || this.submitErrorAddidional(''), submitError: value => value || this.submitErrorAddidional(''),
signMeType: iValue => this.signMe(LoginSignMeType.DefaultOn === iValue), signMeType: iValue => this.signMe(SignMeOn === iValue),
language: value => { language: value => {
this.langRequest(true); this.langRequest(true);
@ -106,10 +95,9 @@ class LoginUserView extends AbstractViewCenter {
submitCommand(self, event) { submitCommand(self, event) {
let form = event.target.form, let form = event.target.form,
data = new FormData(form), data = new FormData(form),
email = this.email().trim(), valid = form.reportValidity();
valid = form.reportValidity() && email;
this.emailError(!email); this.emailError(!this.email());
this.passwordError(!this.password()); this.passwordError(!this.password());
this.formError(!valid); this.formError(!valid);
@ -146,29 +134,28 @@ class LoginUserView extends AbstractViewCenter {
onBuild() { onBuild() {
const signMeLocal = Local.get(ClientSideKeyName.LastSignMe), const signMeLocal = Local.get(ClientSideKeyName.LastSignMe),
signMe = (SettingsGet('SignMe') || 'unused').toLowerCase(); signMe = (SettingsGet('SignMe') || '').toLowerCase();
switch (signMe) { switch (signMe) {
case LoginSignMeTypeAsString.DefaultOff: case 'defaultoff':
case LoginSignMeTypeAsString.DefaultOn: case 'defaulton':
this.signMeType( this.signMeType(
LoginSignMeTypeAsString.DefaultOn === signMe ? LoginSignMeType.DefaultOn : LoginSignMeType.DefaultOff 'defaulton' === signMe ? SignMeOn : SignMeOff
); );
switch (signMeLocal) { switch (signMeLocal) {
case '-1-': case '-1-':
this.signMeType(LoginSignMeType.DefaultOn); this.signMeType(SignMeOn);
break; break;
case '-0-': case '-0-':
this.signMeType(LoginSignMeType.DefaultOff); this.signMeType(SignMeOff);
break; break;
// no default // no default
} }
break; break;
case LoginSignMeTypeAsString.Unused:
default: default:
this.signMeType(LoginSignMeType.Unused); this.signMeType(SignMeUnused);
break; break;
} }
} }