diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-08-30 22:57:37 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-08-30 22:57:37 +0200 |
| commit | daadc84416d22eca651c85627d5dd683d7727d3e (patch) | |
| tree | c52b8c3e89336d4d91e5a4aac8c298d472312c7a /ui/jquery.ui.position.js | |
| parent | c1799024684780995ba666aa1c9acfa34c69f12a (diff) | |
| parent | dec9c54632be191947c310b402810cf6f1b4250a (diff) | |
| download | jquery-ui-daadc84416d22eca651c85627d5dd683d7727d3e.tar.gz jquery-ui-daadc84416d22eca651c85627d5dd683d7727d3e.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.position.js')
| -rw-r--r-- | ui/jquery.ui.position.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js index eef8a95c9..2e2fe215a 100644 --- a/ui/jquery.ui.position.js +++ b/ui/jquery.ui.position.js @@ -360,7 +360,7 @@ $.ui.position = { var within = data.within, withinOffset = within.offset.left + within.scrollLeft, outerWidth = within.width, - offsetLeft = within.isWindow ? 0 : within.offset.left, + offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left, collisionPosLeft = position.left - data.collisionPosition.marginLeft, overLeft = collisionPosLeft - offsetLeft, overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft, @@ -395,7 +395,7 @@ $.ui.position = { var within = data.within, withinOffset = within.offset.top + within.scrollTop, outerHeight = within.height, - offsetTop = within.isWindow ? 0 : within.offset.top, + offsetTop = within.isWindow ? within.scrollTop : within.offset.top, collisionPosTop = position.top - data.collisionPosition.marginTop, overTop = collisionPosTop - offsetTop, overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop, |