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

Cleanup unused login error animations

Browse source
This commit is contained in:
djmaze 2021-02-10 17:16:46 +01:00
parent 111455054e
commit 325f3c8eea
4 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dev/View/Admin/Login.js
View file

@ -31,19 +31,16 @@ class LoginAdminView extends AbstractViewCenter {
submitError: '' submitError: ''
}); });
this.loginErrorAnimation = ko.observable(false).extend({ 'falseTimeout': 500 }); this.formError = ko.observable(false).extend({ 'falseTimeout': 500 });
this.passwordErrorAnimation = ko.observable(false).extend({ 'falseTimeout': 500 });
this.formError = ko.computed(() => this.loginErrorAnimation() || this.passwordErrorAnimation());
this.addSubscribables({ this.addSubscribables({
login: () => this.loginError(false), login: () => this.loginError(false),
password: () => this.passwordError(false), password: () => this.passwordError(false),
loginError: v => this.loginErrorAnimation(!!v), loginError: v => this.formError(!!v),
passwordError: v => this.passwordErrorAnimation(!!v) passwordError: v => this.formError(!!v)
}); });
} }

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

@ -69,16 +69,13 @@ class LoginUserView extends AbstractViewCenter {
signMeType: LoginSignMeType.Unused signMeType: LoginSignMeType.Unused
}); });
this.additionalCodeErrorAnimation = ko.observable(false).extend({ falseTimeout: 500 });
this.mobile = !!Settings.app('mobile'); this.mobile = !!Settings.app('mobile');
this.mobileDevice = !!Settings.app('mobileDevice'); this.mobileDevice = !!Settings.app('mobileDevice');
this.forgotPasswordLinkUrl = Settings.app('forgotPasswordLinkUrl'); this.forgotPasswordLinkUrl = Settings.app('forgotPasswordLinkUrl');
this.registrationLinkUrl = Settings.app('registrationLinkUrl'); this.registrationLinkUrl = Settings.app('registrationLinkUrl');
this.emailErrorAnimation = ko.observable(false).extend({ falseTimeout: 500 }); this.formError = ko.observable(false).extend({ falseTimeout: 500 });
this.passwordErrorAnimation = ko.observable(false).extend({ falseTimeout: 500 });
this.allowLanguagesOnLogin = !!Settings.get('AllowLanguagesOnLogin'); this.allowLanguagesOnLogin = !!Settings.get('AllowLanguagesOnLogin');
@ -88,11 +85,6 @@ class LoginUserView extends AbstractViewCenter {
this.bSendLanguage = false; this.bSendLanguage = false;
this.addComputables({ this.addComputables({
formError:
() =>
this.emailErrorAnimation() ||
this.passwordErrorAnimation() ||
(this.additionalCodeVisibility() && this.additionalCodeErrorAnimation()),
languageFullName: () => convertLangName(this.language()), languageFullName: () => convertLangName(this.language()),
@ -109,12 +101,12 @@ class LoginUserView extends AbstractViewCenter {
password: () => this.passwordError(false), password: () => this.passwordError(false),
additionalCode: () => this.additionalCodeError(false), additionalCode: () => this.additionalCodeError(false),
additionalCodeError: bV => this.additionalCodeErrorAnimation(!!bV), additionalCodeError: bV => this.formError(!!bV),
additionalCodeVisibility: () => this.additionalCodeError(false), additionalCodeVisibility: () => this.additionalCodeError(false),
emailError: bV => this.emailErrorAnimation(!!bV), emailError: bV => this.formError(!!bV),
passwordError: bV => this.passwordErrorAnimation(!!bV), passwordError: bV => this.formError(!!bV),
submitError: value => value || this.submitErrorAddidional(''), submitError: value => value || this.submitErrorAddidional(''),

4
snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
View file

@ -6,7 +6,7 @@
</div> </div>
<div class="wrapper-parent"> <div class="wrapper-parent">
<form class="wrapper submitting-pane loginForm" action="#/" data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}"> <form class="wrapper submitting-pane loginForm" action="#/" data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
<div class="controls" data-bind="css: {'error': loginError, 'animated': loginErrorAnimation}"> <div class="controls" data-bind="css: {'error': loginError}">
<div class="input-append"> <div class="input-append">
<input type="text" class="input-block-level inputLogin" <input type="text" class="input-block-level inputLogin"
name="RainLoopAdminLogin" id="RainLoopAdminLogin" name="RainLoopAdminLogin" id="RainLoopAdminLogin"
@ -18,7 +18,7 @@
</span> </span>
</div> </div>
</div> </div>
<div class="controls" data-bind="css: {'error': passwordError, 'animated': passwordErrorAnimation}"> <div class="controls" data-bind="css: {'error': passwordError}">
<div class="input-append"> <div class="input-append">
<input type="password" class="input-block-level inputPassword" <input type="password" class="input-block-level inputPassword"
placeholder="Password" name="RainLoopAdminPassword" id="RainLoopAdminPassword" placeholder="Password" name="RainLoopAdminPassword" id="RainLoopAdminPassword"

6
snappymail/v/0.0.0/app/templates/Views/User/Login.html
View file

@ -16,7 +16,7 @@
<form class="wrapper submitting-pane loginForm" action="#/" <form class="wrapper submitting-pane loginForm" action="#/"
data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}"> data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
<div class="controls plugin-mark-Login-TopControlGroup" <div class="controls plugin-mark-Login-TopControlGroup"
data-bind="css: {'error': emailError, 'animated': emailErrorAnimation}"> data-bind="css: {'error': emailError}">
<div class="input-append"> <div class="input-append">
<input type="email" class="i18n input-block-level inputEmail" <input type="email" class="i18n input-block-level inputEmail"
name="RainLoopEmail" id="RainLoopEmail" name="RainLoopEmail" id="RainLoopEmail"
@ -29,7 +29,7 @@
</span> </span>
</div> </div>
</div> </div>
<div class="controls" data-bind="css: {'error': passwordError, 'animated': passwordErrorAnimation}"> <div class="controls" data-bind="css: {'error': passwordError}">
<div class="input-append"> <div class="input-append">
<input type="password" class="i18n input-block-level inputPassword" <input type="password" class="i18n input-block-level inputPassword"
name="RainLoopPassword" id="RainLoopPassword" name="RainLoopPassword" id="RainLoopPassword"
@ -46,7 +46,7 @@
</div> </div>
</div> </div>
<div class="controls" <div class="controls"
data-bind="visible: additionalCodeVisibility(), css: {'error': additionalCodeError, 'animated': additionalCodeErrorAnimation}"> data-bind="visible: additionalCodeVisibility(), css: {'error': additionalCodeError}">
<div class="input-append"> <div class="input-append">
<input type="text" class="i18n input-block-level inputAdditionalCode" autocomplete="off" <input type="text" class="i18n input-block-level inputAdditionalCode" autocomplete="off"
autocorrect="off" autocapitalize="off" spellcheck="false" style="padding-right: 35px;" autocorrect="off" autocapitalize="off" spellcheck="false" style="padding-right: 35px;"