Merge pull request #5295 from owncloud/show-eye-in-personal

Shows The Eye permanently in the Confirm Password field in Personal Settings

2 files changed, 6 insertions, 10 deletions

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;
 			
 			};
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]'));