From e961dbaa38dc2a2a9abc620f1036d8d70d238cec Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Fri, 11 Oct 2013 18:32:43 +0530 Subject: Shows The Eye permanently in the Confirm Password field in Personal Settings - fix #5167 --- core/css/styles.css | 1 + core/js/jquery-showpassword.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/css/styles.css b/core/css/styles.css index 1a521019d98..3e150152b56 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -413,6 +413,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } #personal-show + label { margin-top: 1em; margin-left: -3em; + display:inline !important; } #passwordbutton { margin-left: .5em; diff --git a/core/js/jquery-showpassword.js b/core/js/jquery-showpassword.js index e1737643b48..a4373ec82bf 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; }; -- cgit v1.2.3 From 4eed2402967422d0a481a84a8bcc689668010289 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Tue, 15 Oct 2013 11:36:44 +0530 Subject: Should Display PasswordToggle Eye Everywhere. --- core/css/styles.css | 1 - core/js/js.js | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'core') diff --git a/core/css/styles.css b/core/css/styles.css index 3e150152b56..1a521019d98 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -413,7 +413,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } #personal-show + label { margin-top: 1em; margin-left: -3em; - display:inline !important; } #passwordbutton { margin-left: .5em; diff --git a/core/js/js.js b/core/js/js.js index b7f7ff1ac15..5178a26e15d 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -747,14 +747,8 @@ $(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.css("display", "inline").show(); }); - label.hide(); }; setShowPassword($('#adminpass'), $('label[for=show]')); setShowPassword($('#pass2'), $('label[for=personal-show]')); -- cgit v1.2.3 From 2def1a8853c68afc0d1adc9f4c89d09387f27c9c Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Tue, 15 Oct 2013 14:41:18 +0530 Subject: Removes Bogus showpassword js. thx @PVince81 --- core/js/js.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'core') diff --git a/core/js/js.js b/core/js/js.js index 5178a26e15d..c17e3fa2959 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -746,9 +746,7 @@ $(document).ready(function(){ }); var setShowPassword = function(input, label) { - input.showPassword().keyup(function(){ - label.css("display", "inline").show(); - }); + input.showPassword().keyup(); }; setShowPassword($('#adminpass'), $('label[for=show]')); setShowPassword($('#pass2'), $('label[for=personal-show]')); -- cgit v1.2.3