diff options
| author | Luis Dalmolin <luis.nh@gmail.com> | 2012-07-16 09:54:48 -0300 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2012-07-17 16:23:13 -0400 |
| commit | 9c1780f640e2c9cbcbca1182989ae511408c04e9 (patch) | |
| tree | 16a7d73b5a2e6476fe7134243999cbf995c0ca99 | |
| parent | fa5e7c17a804e667513662ea9fbb7e8e6986e42c (diff) | |
| download | jquery-ui-9c1780f640e2c9cbcbca1182989ae511408c04e9.tar.gz jquery-ui-9c1780f640e2c9cbcbca1182989ae511408c04e9.zip | |
Datepicker: Fixed position problem when input is in a fixed element. Fixes #5626 - DatePicker doesn't work inside fixed div.
(cherry picked from commit 147ec7bd624e631fe019973876ad587e85d112bf)
| -rw-r--r-- | ui/jquery.ui.datepicker.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js index 51d1b183b..1c94d61fd 100644 --- a/ui/jquery.ui.datepicker.js +++ b/ui/jquery.ui.datepicker.js @@ -765,8 +765,8 @@ $.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 = document.documentElement.clientWidth + $(document).scrollLeft(); - var viewHeight = document.documentElement.clientHeight + $(document).scrollTop(); + var viewWidth = document.documentElement.clientWidth + (isFixed ? 0 : $(document).scrollLeft()); + var viewHeight = document.documentElement.clientHeight + (isFixed ? 0 : $(document).scrollTop()); offset.left -= (this._get(inst, 'isRTL') ? (dpWidth - inputWidth) : 0); offset.left -= (isFixed && offset.left == inst.input.offset().left) ? $(document).scrollLeft() : 0; |