summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-10-14 12:52:07 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-10-14 12:52:07 +0200
commitdf1313d025b483e823371d1e6aee001350095ad4 (patch)
tree1cc83238bcef90a1835938f9ffd7a928f1152205
parent4b8632325ae235bc41af809d47631d0088030110 (diff)
parent14dc36efe6326d1f626a41c4295f570a729d57ae (diff)
downloadnextcloud-server-df1313d025b483e823371d1e6aee001350095ad4.tar.gz
nextcloud-server-df1313d025b483e823371d1e6aee001350095ad4.zip
Merge pull request #19625 from owncloud/passwordchange-hidestrengthify
Properly hide strengthify after password change
-rw-r--r--core/vendor/strengthify/jquery.strengthify.js2
-rw-r--r--settings/js/personal.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/vendor/strengthify/jquery.strengthify.js b/core/vendor/strengthify/jquery.strengthify.js
index 21f5fa82956..4fcc4d7c7c4 100644
--- a/core/vendor/strengthify/jquery.strengthify.js
+++ b/core/vendor/strengthify/jquery.strengthify.js
@@ -58,7 +58,7 @@
dataType: 'script',
url: options.zxcvbn
}).done(function() {
- me.bind('keyup input', function() {
+ me.bind('keyup input change', function() {
var password = $(this).val(),
// hide strengthigy if no input is provided
opacity = (password === '') ? 0 : 1,
diff --git a/settings/js/personal.js b/settings/js/personal.js
index acc1478cd78..3439eba686f 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -189,7 +189,7 @@ $(document).ready(function () {
$.post(OC.generateUrl('/settings/personal/changepassword'), post, function (data) {
if (data.status === "success") {
$('#pass1').val('');
- $('#pass2').val('');
+ $('#pass2').val('').change();
// Hide a possible errormsg and show successmsg
$('#password-changed').removeClass('hidden').addClass('inlineblock');
$('#password-error').removeClass('inlineblock').addClass('hidden');