diff options
| author | Kris Borchers <kris.borchers@gmail.com> | 2013-08-11 19:16:41 -0500 |
|---|---|---|
| committer | Kris Borchers <kris.borchers@gmail.com> | 2013-08-11 19:16:41 -0500 |
| commit | ec61e54e6fcfe33adab09d1ecad8db2edcbad4cc (patch) | |
| tree | 1621f4ff0e398ba21defa824817caa8391756984 /ui/jquery.ui.position.js | |
| parent | a156c2cadc81acf0856feb95ad41fe5f1a38315e (diff) | |
| parent | cceb163548eea78525a3a60ada95a5af6e3ddf25 (diff) | |
| download | jquery-ui-ec61e54e6fcfe33adab09d1ecad8db2edcbad4cc.tar.gz jquery-ui-ec61e54e6fcfe33adab09d1ecad8db2edcbad4cc.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.position.js')
| -rw-r--r-- | ui/jquery.ui.position.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js index d45b24bb1..21c3cef1b 100644 --- a/ui/jquery.ui.position.js +++ b/ui/jquery.ui.position.js @@ -436,7 +436,7 @@ $.ui.position = { } } else if ( overBottom > 0 ) { - newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop; + newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop; if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) { position.top += myOffset + atOffset + offset; } |