diff options
| author | Thomas Meyer <meyertee@gmail.com> | 2013-09-04 18:54:07 +0200 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2015-01-09 15:09:57 -0500 |
| commit | ebaaca7206cae201ec069dbaed85bc8d6beeab32 (patch) | |
| tree | 7e613ca34c56a128940028697f10a6a9de2dbc50 | |
| parent | ab798cb4646cfeb79f1949eb70cd64813a248d87 (diff) | |
| download | jquery-ui-ebaaca7206cae201ec069dbaed85bc8d6beeab32.tar.gz jquery-ui-ebaaca7206cae201ec069dbaed85bc8d6beeab32.zip | |
Position: Restore old flip collision handling
This reverts commit 7f808b2047725cd8fde51a948cb4e5f5946c82e1.
Fixes #8710
Ref gh-1071
| -rw-r--r-- | ui/position.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/position.js b/ui/position.js index 884de240d..41e5b6432 100644 --- a/ui/position.js +++ b/ui/position.js @@ -455,12 +455,12 @@ $.ui.position = { newOverBottom; if ( overTop < 0 ) { newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset; - if ( ( position.top + myOffset + atOffset + offset) > overTop && ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) ) { + if ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) { position.top += myOffset + atOffset + offset; } } else if ( overBottom > 0 ) { newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop; - if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) { + if ( newOverTop > 0 || abs( newOverTop ) < overBottom ) { position.top += myOffset + atOffset + offset; } } |