diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-16 15:45:55 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-16 15:45:55 +0200 |
| commit | fdeef5e874ae7a8e4a23a737e5a1e948804d768a (patch) | |
| tree | 2cc093162b583210b8f878f5ab9d670c270cff2e /core/js/js.js | |
| parent | 60541358ac375652d74e4a5b5d8cad865833aa92 (diff) | |
| parent | c3f7d22adc59949ad41c33d450b6d3e226cdefdb (diff) | |
| download | nextcloud-server-fdeef5e874ae7a8e4a23a737e5a1e948804d768a.tar.gz nextcloud-server-fdeef5e874ae7a8e4a23a737e5a1e948804d768a.zip | |
Merge branch 'master' into fixing-appframework-master
Conflicts:
lib/private/appframework/middleware/security/securitymiddleware.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/core/js/js.js b/core/js/js.js index b7f7ff1ac15..c17e3fa2959 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -746,15 +746,7 @@ $(document).ready(function(){ }); var setShowPassword = function(input, label) { - input.showPassword().keyup(function(){ - if (input.val().length == 0) { - label.hide(); - } - else { - label.css("display", "inline").show(); - } - }); - label.hide(); + input.showPassword().keyup(); }; setShowPassword($('#adminpass'), $('label[for=show]')); setShowPassword($('#pass2'), $('label[for=personal-show]')); |