diff options
| author | Ca-Phun Ung <pazu2k@gmail.com> | 2009-01-28 05:11:10 +0000 |
|---|---|---|
| committer | Ca-Phun Ung <pazu2k@gmail.com> | 2009-01-28 05:11:10 +0000 |
| commit | 3aeeeeb75af2963e0733be9397314c99fdfba065 (patch) | |
| tree | fde091228bd41e7d858f61c54256fd277dd454ef /ui | |
| parent | c9e6d286617de374be9c3cb3cb5b5c9ae445c0a9 (diff) | |
| download | jquery-ui-3aeeeeb75af2963e0733be9397314c99fdfba065.tar.gz jquery-ui-3aeeeeb75af2963e0733be9397314c99fdfba065.zip | |
datepicker: fixes #3863: fixed vertical position when scroll position is present and added a viewport visual testcase.
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/ui.datepicker.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/ui.datepicker.js b/ui/ui.datepicker.js index 831cabc91..c7705949d 100644 --- a/ui/ui.datepicker.js +++ b/ui/ui.datepicker.js @@ -617,14 +617,14 @@ $.extend(Datepicker.prototype, { var dpHeight = inst.dpDiv.outerHeight(); var inputWidth = inst.input ? inst.input.outerWidth() : 0; var inputHeight = inst.input ? inst.input.outerHeight() : 0; - var viewWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth; - var viewHeight = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight; + var viewWidth = (window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth) + $(document).scrollLeft(); + var viewHeight = (window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight) + $(document).scrollTop(); offset.left -= (this._get(inst, 'isRTL') ? (dpWidth - inputWidth) : 0); offset.left -= (isFixed && offset.left == inst.input.offset().left) ? $(document).scrollLeft() : 0; offset.top -= (isFixed && offset.top == (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0; - // now check if datepicker is showing outside window viewpoint - move to a better place if so. + // now check if datepicker is showing outside window viewport - move to a better place if so. offset.left -= (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ? Math.abs(offset.left + dpWidth - viewWidth) : 0; offset.top -= (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ? Math.abs(offset.top + dpHeight + inputHeight*2 - viewHeight) : 0; |