Datepicker: Fixed #5052 Set focus error in IE8 for disabled and hidden elements

This commit is contained in:
Keith Wood 2010-01-25 08:20:28 +00:00
parent 505af6a0e9
commit c3dd4ac373

View File

@ -647,7 +647,7 @@ $.extend(Datepicker.prototype, {
inst.dpDiv[showAnim || 'show']((showAnim ? duration : null), postProcess);
if (!showAnim)
postProcess();
if (inst.input[0].type != 'hidden')
if (inst.input.is(':visible') && !inst.input.is(':disabled'))
inst.input[0].focus();
$.datepicker._curInst = inst;
}
@ -691,7 +691,8 @@ $.extend(Datepicker.prototype, {
'Class']('ui-datepicker-multi');
inst.dpDiv[(this._get(inst, 'isRTL') ? 'add' : 'remove') +
'Class']('ui-datepicker-rtl');
if (inst.input && inst.input[0].type != 'hidden' && inst == $.datepicker._curInst)
if (inst == $.datepicker._curInst && inst.input &&
inst.input.is(':visible') && !inst.input.is(':disabled'))
$(inst.input[0]).focus();
},