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

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

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;
 			
 			};

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