diff --git a/core/js/jquery-showpassword.js b/core/js/jquery-showpassword.js index e1737643b484e3055fc90ce42119658f006d12ca..a4373ec82bf73c4c4fbb2e086d0e3e5b33cc6dcd 100644 --- a/core/js/jquery-showpassword.js +++ b/core/js/jquery-showpassword.js @@ -38,7 +38,11 @@ 'tabindex' : $element.attr('tabindex'), 'autocomplete' : 'off' }); - + + if($element.attr('placeholder') !== undefined) { + $clone.attr('placeholder', $element.attr('placeholder')); + } + return $clone; }; diff --git a/core/js/js.js b/core/js/js.js index b7f7ff1ac15b53ac86ffbd7e0c761abe3ad655ee..c17e3fa29595765ca55d8bc8a90d05441dace35e 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]'));