Merge pull request #14918 from owncloud/fix-password-change-ie8-and-9
Don't use placeholder for password in IE8 & 9
This commit is contained in:
commit
fc59a37ae7
|
@ -989,6 +989,11 @@ $(document).ready(function() {
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
$('#linkPass').slideToggle(OC.menuSpeed);
|
$('#linkPass').slideToggle(OC.menuSpeed);
|
||||||
|
// TODO drop with IE8 drop
|
||||||
|
if(html.hasClass('ie8')) {
|
||||||
|
$('#linkPassText').attr('placeholder', null);
|
||||||
|
$('#linkPassText').val('');
|
||||||
|
}
|
||||||
$('#linkPassText').focus();
|
$('#linkPassText').focus();
|
||||||
}
|
}
|
||||||
if (expireDateString !== '') {
|
if (expireDateString !== '') {
|
||||||
|
|
|
@ -172,7 +172,13 @@ $(document).ready(function () {
|
||||||
$('#pass2').showPassword().keyup();
|
$('#pass2').showPassword().keyup();
|
||||||
}
|
}
|
||||||
$("#passwordbutton").click(function () {
|
$("#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
|
// Serialize the data
|
||||||
var post = $("#passwordform").serialize();
|
var post = $("#passwordform").serialize();
|
||||||
$('#passwordchanged').hide();
|
$('#passwordchanged').hide();
|
||||||
|
|
Loading…
Reference in New Issue