Skip to content

Commit

Permalink
Position: Fix flip collision. Fixes #5932 - Position: flip collision …
Browse files Browse the repository at this point in the history
…handling is wrong in some cases.
  • Loading branch information
bhollis authored and scottgonzalez committed Aug 12, 2010
1 parent 03eea0e commit 7692b6e
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions ui/jquery.ui.position.js
Expand Up @@ -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 ) {
Expand All @@ -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;
Expand Down

1 comment on commit 7692b6e

@jzaefferer
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice. That code turned out to of the write-only kind, nice to see someone else could figure out what actually happens.

Please sign in to comment.