From 276cd5cd8cbef787328335a11ad19864242ccafd Mon Sep 17 00:00:00 2001 From: Thomas Meyer Date: Wed, 4 Sep 2013 18:54:07 +0200 Subject: [PATCH] Position: Restore old flip collision handling This reverts commit 7f808b2047725cd8fde51a948cb4e5f5946c82e1. Fixes #8710 Ref gh-1071 (cherry picked from commit ebaaca7206cae201ec069dbaed85bc8d6beeab32) --- ui/position.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/position.js b/ui/position.js index 4a4b56637..28aca6dc6 100644 --- a/ui/position.js +++ b/ui/position.js @@ -448,12 +448,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; } } -- 2.39.5