diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-02-24 11:54:17 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-02-24 11:54:17 +0100 |
| commit | e5c6af51027f786d74f859584f0aa6c85db6ead6 (patch) | |
| tree | 8435e257caf79adacb96ce0a591dd48050a81155 /settings/js | |
| parent | da8e34cf7f31ae6b560fabdd9c59179b4e1f4f0a (diff) | |
| parent | 4b2d80a34b9ee11be2cf4641d2c99056a1a44b9b (diff) | |
| download | nextcloud-server-e5c6af51027f786d74f859584f0aa6c85db6ead6.tar.gz nextcloud-server-e5c6af51027f786d74f859584f0aa6c85db6ead6.zip | |
Merge pull request #10599 from owncloud/move_passwordchange_text
Make the password changed msg inline to fix #10242
Diffstat (limited to 'settings/js')
| -rw-r--r-- | settings/js/personal.js | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js index 1202d9743d2..e2fb6f025f1 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -182,20 +182,25 @@ $(document).ready(function () { if (data.status === "success") { $('#pass1').val(''); $('#pass2').val(''); - $('#passwordchanged').show(); + // Hide a possible errormsg and show successmsg + $('#password-changed').removeClass('hidden').addClass('inlineblock'); + $('#password-error').removeClass('inlineblock').addClass('hidden'); } else { if (typeof(data.data) !== "undefined") { $('#passworderror').html(data.data.message); } else { $('#passworderror').html(t('Unable to change password')); } - $('#passworderror').show(); + // Hide a possible successmsg and show errormsg + $('#password-changed').removeClass('inlineblock').addClass('hidden'); + $('#password-error').removeClass('hidden').addClass('inlineblock'); } }); return false; } else { - $('#passwordchanged').hide(); - $('#passworderror').show(); + // Hide a possible successmsg and show errormsg + $('#password-changed').removeClass('inlineblock').addClass('hidden'); + $('#password-error').removeClass('hidden').addClass('inlineblock'); return false; } |