From cfa6aa328e21514c2eec928272d769f77bc62e56 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=CC=88rn=20Zaefferer?= Date: Fri, 20 Apr 2012 14:13:52 +0200 Subject: [PATCH] Position: offset() always returns null for window, so provide default 0/0 coordinates to avoid checks further down --- ui/jquery.ui.position.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js index ea176688e..5a2ede2b8 100644 --- a/ui/jquery.ui.position.js +++ b/ui/jquery.ui.position.js @@ -71,7 +71,7 @@ $.position = { return { element: withinElement, isWindow: isWindow, - offset: withinElement.offset(), + offset: withinElement.offset() || { left: 0, top: 0 }, scrollLeft: withinElement.scrollLeft(), scrollTop: withinElement.scrollTop(), width: isWindow ? withinElement.width() : withinElement.outerWidth(), @@ -361,7 +361,7 @@ $.ui.position = { } var within = data.within, - withinOffset = ( within.isWindow ? 0 : within.offset.left ) + within.scrollLeft, + withinOffset = within.offset.left + within.scrollLeft, outerWidth = within.width, offsetLeft = within.isWindow ? 0 : within.offset.left, collisionPosLeft = position.left - data.collisionPosition.marginLeft, @@ -399,7 +399,7 @@ $.ui.position = { } var within = data.within, - withinOffset = ( within.isWindow ? 0 : within.offset.top ) + within.scrollTop, + withinOffset = within.offset.top + within.scrollTop, outerHeight = within.height, offsetTop = within.isWindow ? 0 : within.offset.top, collisionPosTop = position.top - data.collisionPosition.marginTop, -- 2.39.5