Skip to content
Permalink
Browse files

Datepicker: Fixed #5052 Set focus error in IE8 for disabled and hidde…

…n elements
  • Loading branch information
Keith Wood
Keith Wood committed Jan 25, 2010
1 parent 505af6a commit c3dd4ac373660b1d36eb527a7ad1387d5d39ef9d
Showing with 3 additions and 2 deletions.
  1. +3 −2 ui/jquery.ui.datepicker.js
@@ -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();
},

0 comments on commit c3dd4ac

Please sign in to comment.
You can’t perform that action at this time.