summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2015-03-26 22:06:22 +0100
committerJan-Christoph Borchardt <hey@jancborchardt.net>2015-03-26 22:06:22 +0100
commitfc59a37ae7e28ad8ef7a0a383e87024ff942408d (patch)
tree76dd17d63bb60bc9a49cbcc0b29872469741b874 /settings
parente8109f0bc3065cb038bc97faa37d0a19e748fdd9 (diff)
parent0a589d938ce89adae7119d6f84f151644bdf166f (diff)
downloadnextcloud-server-fc59a37ae7e28ad8ef7a0a383e87024ff942408d.tar.gz
nextcloud-server-fc59a37ae7e28ad8ef7a0a383e87024ff942408d.zip
Merge pull request #14918 from owncloud/fix-password-change-ie8-and-9
Don't use placeholder for password in IE8 & 9
Diffstat (limited to 'settings')
-rw-r--r--settings/js/personal.js8
1 files changed, 7 insertions, 1 deletions
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();