Merge pull request #14918 from owncloud/fix-password-change-ie8-and-9

Don't use placeholder for password in IE8 & 9

2 files changed, 12 insertions, 1 deletions

diff --git a/core/js/share.js b/core/js/share.js
index 061ac6affa2..b9b4a5bc754 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -989,6 +989,11 @@ $(document).ready(function() {
 				});
 			} else {
 				$('#linkPass').slideToggle(OC.menuSpeed);
+				// TODO drop with IE8 drop
+				if(html.hasClass('ie8')) {
+					$('#linkPassText').attr('placeholder', null);
+					$('#linkPassText').val('');
+				}
 				$('#linkPassText').focus();
 			}
 			if (expireDateString !== '') {
diff --git a/settings/js/personal.js b/settings/js/personal.js
index e2fb6f025f1..302906702bd 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -172,7 +172,13 @@ $(document).ready(function () {
 		$('#pass2').showPassword().keyup();
 	}
 	$("#passwordbutton").click(function () {
-		if ($('#pass1').val() !== '' && $('#pass2').val() !== '') {
+		var isIE8or9 = html.hasClass('lte9');
+		// FIXME - TODO - once support for IE8 and IE9 is dropped
+		// for IE8 and IE9 this will check additionally if the typed in password
+		// is different from the placeholder, because in IE8/9 the placeholder
+		// is simply set as the value to look like a placeholder
+		if ($('#pass1').val() !== '' && $('#pass2').val() !== ''
+			&& !(isIE8or9 && $('#pass2').val() === $('#pass2').attr('placeholder'))) {
 			// Serialize the data
 			var post = $("#passwordform").serialize();
 			$('#passwordchanged').hide();