From 7692b6e65f27c9e37aaec45d92e120fbd43288d9 Mon Sep 17 00:00:00 2001 From: Ben Hollis Date: Wed, 4 Aug 2010 23:57:19 -0700 Subject: [PATCH] Position: Fix flip collision. Fixes #5932 - Position: flip collision handling is wrong in some cases. --- ui/jquery.ui.position.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js index 50ef23d5a..8e2bc97f1 100644 --- a/ui/jquery.ui.position.js +++ b/ui/jquery.ui.position.js @@ -164,11 +164,14 @@ $.ui.position = { data.my[ 0 ] === "right" ? data.elemWidth : 0, + atOffset = data.at[ 0 ] === "left" ? + data.targetWidth : + -data.targetWidth, offset = -2 * data.offset[ 0 ]; position.left += position.left < 0 ? - myOffset + data.targetWidth + offset : + myOffset + atOffset + offset : over > 0 ? - myOffset - data.targetWidth + offset : + myOffset + atOffset + offset : 0; }, top: function( position, data ) { @@ -187,7 +190,7 @@ $.ui.position = { -data.targetHeight, offset = -2 * data.offset[ 1 ]; position.top += position.top < 0 ? - myOffset + data.targetHeight + offset : + myOffset + atOffset + offset : over > 0 ? myOffset + atOffset + offset : 0; -- 2.39.5