diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-11-05 16:33:18 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-11-05 17:38:29 +0100 |
| commit | 91195b7cf2e55d82b98fdc76ef4ad4a6eecad10d (patch) | |
| tree | 9576f92df00b944818a9147833eb45a0a955dd38 /core/js/login.js | |
| parent | 6347fe86c9fbecc49c25b732da9e3ba858356b48 (diff) | |
| download | nextcloud-server-91195b7cf2e55d82b98fdc76ef4ad4a6eecad10d.tar.gz nextcloud-server-91195b7cf2e55d82b98fdc76ef4ad4a6eecad10d.zip | |
Not disabled by default
Fixed transition bug of grouptop
Fix password submit and error handling
Fixed multiple form send
Fix submit loading state
fix login form sending state
Replace loader type
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/js/login.js')
| -rw-r--r-- | core/js/login.js | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/core/js/login.js b/core/js/login.js index 09e7499e811..012b4e0280e 100644 --- a/core/js/login.js +++ b/core/js/login.js @@ -12,12 +12,17 @@ */ OC.Login = _.extend(OC.Login || {}, { onLogin: function () { - $('#submit-wrapper .submit-icon') - .removeClass('icon-confirm-white') - .addClass('icon-loading-small'); - $('#submit') - .attr('value', t('core', 'Logging in …')); - return true; + // Only if password reset form is not active + if($('form[name=login][action]').length === 0) { + $('#submit-wrapper .submit-icon') + .removeClass('icon-confirm-white') + .addClass('icon-loading-small-dark'); + $('#submit') + .attr('value', t('core', 'Logging in …')); + $('.login-additional').fadeOut(); + return true; + } + return false; }, rememberLogin: function(){ |