diff options
| author | kondou <kondou@ts.unde.re> | 2014-08-22 16:48:21 +0200 |
|---|---|---|
| committer | Christopher Schäpers <christopher@schaepers.it> | 2015-02-11 14:27:05 +0100 |
| commit | 95cfe292f40948d3c3b1f1ceb6ca8c9099226ef1 (patch) | |
| tree | 0584abe96b3f3057ebec71245ddc94215dd4a5d8 /settings/js | |
| parent | 9baf7a0a3f76e876308cd52fc0c0c30d2b8c9478 (diff) | |
| download | nextcloud-server-95cfe292f40948d3c3b1f1ceb6ca8c9099226ef1.tar.gz nextcloud-server-95cfe292f40948d3c3b1f1ceb6ca8c9099226ef1.zip | |
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 0cf0cd81a7b..a157c1b5c0c 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; } |