@@ -317,9 +317,10 @@ $.ui.position = {
317
317
isWindow = $ . isWindow ( data . within [ 0 ] ) ,
318
318
withinOffset = ( isWindow ? 0 : within . offset ( ) . left ) + within . scrollLeft ( ) ,
319
319
outerWidth = isWindow ? within . width ( ) : within . outerWidth ( ) ,
320
+ offsetLeft = isWindow ? 0 : within . offset ( ) . left ,
320
321
collisionPosLeft = position . left - data . collisionPosition . marginLeft ,
321
- overLeft = collisionPosLeft - withinOffset ,
322
- overRight = collisionPosLeft + data . collisionWidth - outerWidth - withinOffset ,
322
+ overLeft = collisionPosLeft - offsetLeft ,
323
+ overRight = collisionPosLeft + data . collisionWidth - outerWidth - offsetLeft ,
323
324
left = data . my [ 0 ] === "left" ,
324
325
myOffset = data . my [ 0 ] === "left" ?
325
326
- data . elemWidth :
@@ -343,7 +344,7 @@ $.ui.position = {
343
344
}
344
345
}
345
346
else if ( overRight > 0 ) {
346
- newOverLeft = position . left - data . collisionPosition . marginLeft + myOffset + atOffset + offset - withinOffset ;
347
+ newOverLeft = position . left - data . collisionPosition . marginLeft + myOffset + atOffset + offset - offsetLeft ;
347
348
if ( newOverLeft > 0 || Math . abs ( newOverLeft ) < overRight ) {
348
349
data . elem
349
350
. addClass ( "ui-flipped-left" ) ;
@@ -365,9 +366,10 @@ $.ui.position = {
365
366
isWindow = $ . isWindow ( data . within [ 0 ] ) ,
366
367
withinOffset = ( isWindow ? 0 : within . offset ( ) . top ) + within . scrollTop ( ) ,
367
368
outerHeight = isWindow ? within . height ( ) : within . outerHeight ( ) ,
369
+ offsetTop = isWindow ? 0 : within . offset ( ) . top ,
368
370
collisionPosTop = position . top - data . collisionPosition . marginTop ,
369
- overTop = collisionPosTop - withinOffset ,
370
- overBottom = collisionPosTop + data . collisionHeight - outerHeight - withinOffset ,
371
+ overTop = collisionPosTop - offsetTop ,
372
+ overBottom = collisionPosTop + data . collisionHeight - outerHeight - offsetTop ,
371
373
top = data . my [ 1 ] === "top" ,
372
374
myOffset = top ?
373
375
- data . elemHeight :
@@ -390,7 +392,7 @@ $.ui.position = {
390
392
}
391
393
}
392
394
else if ( overBottom > 0 ) {
393
- newOverTop = position . top - data . collisionPosition . marginTop + myOffset + atOffset + offset - withinOffset ;
395
+ newOverTop = position . top - data . collisionPosition . marginTop + myOffset + atOffset + offset - offsetTop ;
394
396
if ( ( position . top + myOffset + atOffset + offset ) > overBottom && ( newOverTop > 0 || Math . abs ( newOverTop ) < overBottom ) ) {
395
397
data . elem
396
398
. addClass ( "ui-flipped-top" ) ;
0 commit comments