Navigation Menu

Skip to content

Commit

Permalink
Correct datepicker placement when used in static areas
Browse files Browse the repository at this point in the history 
Correct select coverage in IE 6-
  • Loading branch information
Keith Wood committed Jun 20, 2008
1 parent 281f88d commit f3d1ead
Showing 1 changed file with 23 additions and 20 deletions.
43 changes: 23 additions & 20 deletions ui/ui.datepicker.js
View file
Expand Up @@ -101,8 +101,7 @@ function Datepicker() {
maxDate: null, // The latest selectable date, or null for no limit maxDate: null, // The latest selectable date, or null for no limit
speed: 'normal', // Speed of display/closure speed: 'normal', // Speed of display/closure
beforeShowDay: null, // Function that takes a date and returns an array with beforeShowDay: null, // Function that takes a date and returns an array with
// [0] = true if selectable, false if not, // [0] = true if selectable, false if not, [1] = custom CSS class name(s) or '',
// [1] = custom CSS class name(s) or '',
// [2] = cell title (optional), e.g. $.datepicker.noWeekends // [2] = cell title (optional), e.g. $.datepicker.noWeekends
beforeShow: null, // Function that takes an input field and beforeShow: null, // Function that takes an input field and
// returns a set of custom settings for the date picker // returns a set of custom settings for the date picker
Expand Down Expand Up @@ -444,6 +443,7 @@ $.extend(Datepicker.prototype, {
var isFixed = false; var isFixed = false;
$(input).parents().each(function() { $(input).parents().each(function() {
isFixed |= $(this).css('position') == 'fixed'; isFixed |= $(this).css('position') == 'fixed';
return !isFixed;
}); });
if (isFixed && $.browser.opera) { // correction for Opera when fixed and scrolled if (isFixed && $.browser.opera) { // correction for Opera when fixed and scrolled
$.datepicker._pos[0] -= document.documentElement.scrollLeft; $.datepicker._pos[0] -= document.documentElement.scrollLeft;
Expand All @@ -459,7 +459,7 @@ $.extend(Datepicker.prototype, {
inst._datepickerDiv.width(inst._getNumberOfMonths()[1] * inst._datepickerDiv.width(inst._getNumberOfMonths()[1] *
$('.ui-datepicker', inst._datepickerDiv[0])[0].offsetWidth); $('.ui-datepicker', inst._datepickerDiv[0])[0].offsetWidth);
// and adjust position before showing // and adjust position before showing
offset = $.datepicker._checkOffset(inst, offset); offset = $.datepicker._checkOffset(inst, offset, isFixed);
inst._datepickerDiv.css({position: ($.datepicker._inDialog && $.blockUI ? inst._datepickerDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
'static' : (isFixed ? 'fixed' : 'absolute')), display: 'none', 'static' : (isFixed ? 'fixed' : 'absolute')), display: 'none',
left: offset.left + 'px', top: offset.top + 'px'}); left: offset.left + 'px', top: offset.top + 'px'});
Expand All @@ -483,7 +483,11 @@ $.extend(Datepicker.prototype, {


/* Generate the date picker content. */ /* Generate the date picker content. */
_updateDatepicker: function(inst) { _updateDatepicker: function(inst) {
inst._datepickerDiv.empty().append(inst._generateDatepicker()); var dims = {width: inst._datepickerDiv.width() + 4,
height: inst._datepickerDiv.height() + 4};
inst._datepickerDiv.empty().append(inst._generateDatepicker()).
find('iframe.ui-datepicker-cover').
css({width: dims.width, height: dims.height});
var numMonths = inst._getNumberOfMonths(); var numMonths = inst._getNumberOfMonths();
if (numMonths[0] != 1 || numMonths[1] != 1) if (numMonths[0] != 1 || numMonths[1] != 1)
inst._datepickerDiv.addClass('ui-datepicker-multi'); inst._datepickerDiv.addClass('ui-datepicker-multi');
Expand All @@ -500,27 +504,26 @@ $.extend(Datepicker.prototype, {
}, },


/* Check positioning to remain on screen. */ /* Check positioning to remain on screen. */
_checkOffset: function(inst, offset) { _checkOffset: function(inst, offset, isFixed) {
var isFixed = inst._datepickerDiv.css('position') == 'fixed';
var pos = inst._input ? $.datepicker._findPos(inst._input[0]) : null; var pos = inst._input ? $.datepicker._findPos(inst._input[0]) : null;
var browserWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth; var browserWidth = window.innerWidth || document.documentElement.clientWidth;
var browserHeight = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight; var browserHeight = window.innerHeight || document.documentElement.clientHeight;
var scrollX = (isFixed ? 0 : document.documentElement.scrollLeft || document.body.scrollLeft); var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
var scrollY = (isFixed ? 0 : document.documentElement.scrollTop || document.body.scrollTop); var scrollY = document.documentElement.scrollTop || document.body.scrollTop;
// reposition date picker horizontally if outside the browser window // reposition date picker horizontally if outside the browser window
if ((offset.left + inst._datepickerDiv.width() - if ((offset.left + inst._datepickerDiv.width() - scrollX) > browserWidth)
(isFixed && $.browser.msie ? document.documentElement.scrollLeft : 0)) > offset.left = Math.max((isFixed ? 0 : scrollX),
(browserWidth + scrollX)) pos[0] + (inst._input ? inst._input.width() : 0) - (isFixed ? scrollX : 0) - inst._datepickerDiv.width() -
offset.left = Math.max(scrollX,
pos[0] + (inst._input ? $(inst._input[0]).width() : null) - inst._datepickerDiv.width() -
(isFixed && $.browser.opera ? document.documentElement.scrollLeft : 0)); (isFixed && $.browser.opera ? document.documentElement.scrollLeft : 0));
else
offset.left -= (isFixed ? scrollX : 0);
// reposition date picker vertically if outside the browser window // reposition date picker vertically if outside the browser window
if ((offset.top + inst._datepickerDiv.height() - if ((offset.top + inst._datepickerDiv.height() - scrollY) > browserHeight)
(isFixed && $.browser.msie ? document.documentElement.scrollTop : 0)) > offset.top = Math.max((isFixed ? 0 : scrollY),
(browserHeight + scrollY)) pos[1] - (isFixed ? scrollY : 0) - (this._inDialog ? 0 : inst._datepickerDiv.height()) -
offset.top = Math.max(scrollY,
pos[1] - (this._inDialog ? 0 : inst._datepickerDiv.height()) -
(isFixed && $.browser.opera ? document.documentElement.scrollTop : 0)); (isFixed && $.browser.opera ? document.documentElement.scrollTop : 0));
else
offset.top -= (isFixed ? scrollY : 0);
return offset; return offset;
}, },


Expand Down

0 comments on commit f3d1ead

Please sign in to comment.