aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.position.js
diff options
context:
space:
mode:
authorDavid Murdoch <musicisair@yahoo.com>2011-05-13 19:17:42 +0000
committerDavid Murdoch <musicisair@yahoo.com>2011-05-13 19:17:42 +0000
commit2f4da6f13d825698ce1fed5c11b2b4e8afada04e (patch)
tree30479659b8498a3b8f4c8879605a98409620b951 /ui/jquery.ui.position.js
parente31d707d93faafa6ba788de06688069015411adf (diff)
downloadjquery-ui-2f4da6f13d825698ce1fed5c11b2b4e8afada04e.tar.gz
jquery-ui-2f4da6f13d825698ce1fed5c11b2b4e8afada04e.zip
Update var name to avoid confusion
Diffstat (limited to 'ui/jquery.ui.position.js')
-rw-r--r--ui/jquery.ui.position.js40
1 files changed, 20 insertions, 20 deletions
diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js
index c1c815bd2..6020f0141 100644
--- a/ui/jquery.ui.position.js
+++ b/ui/jquery.ui.position.js
@@ -185,12 +185,12 @@ $.fn.position = function( options ) {
$.ui.position = {
fit: {
left: function( position, data ) {
- var win = data.within,
+ var within = data.within,
isWindow = $.isWindow( data.within[0] ),
- winOffset = isWindow ? 0 : win.offset().left,
- outerWidth = isWindow ? win.width() : win.outerWidth(),
- overLeft = win.scrollLeft() - data.collisionPosition.left + winOffset,
- overRight = data.collisionPosition.left + data.collisionWidth - outerWidth - win.scrollLeft() - winOffset;
+ withinOffset = isWindow ? 0 : within.offset().left,
+ outerWidth = isWindow ? within.width() : within.outerWidth(),
+ overLeft = within.scrollLeft() - data.collisionPosition.left + withinOffset,
+ overRight = data.collisionPosition.left + data.collisionWidth - outerWidth - within.scrollLeft() - withinOffset;
// element is wider than window or too far left -> align with left edge
if ( data.collisionWidth > outerWidth || overLeft > 0 ) {
@@ -204,12 +204,12 @@ $.ui.position = {
}
},
top: function( position, data ) {
- var win = data.within,
+ var within = data.within,
isWindow = $.isWindow( data.within[0] ),
- winOffset = isWindow ? 0 : win.offset().top,
- outerHeight = isWindow ? win.height() : win.outerHeight(),
- overTop = win.scrollTop() - data.collisionPosition.top + winOffset,
- overBottom = data.collisionPosition.top + data.collisionHeight - outerHeight - win.scrollTop() - winOffset;
+ withinOffset = isWindow ? 0 : within.offset().top,
+ outerHeight = isWindow ? within.height() : within.outerHeight(),
+ overTop = within.scrollTop() - data.collisionPosition.top + withinOffset,
+ overBottom = data.collisionPosition.top + data.collisionHeight - outerHeight - within.scrollTop() - withinOffset;
// element is taller than window or too far up -> align with top edge
if ( data.collisionHeight > outerHeight || overTop > 0 ) {
@@ -229,12 +229,12 @@ $.ui.position = {
return;
}
- var win = data.within,
+ var within = data.within,
isWindow = $.isWindow( data.within[0] ),
- winOffset = isWindow ? 0 : win.offset().left,
- outerWidth = isWindow ? win.width() : win.outerWidth(),
- overLeft = data.collisionPosition.left - winOffset,
- overRight = data.collisionPosition.left + data.collisionWidth - outerWidth - win.scrollLeft() - winOffset,
+ withinOffset = isWindow ? 0 : within.offset().left,
+ outerWidth = isWindow ? within.width() : within.outerWidth(),
+ overLeft = data.collisionPosition.left - withinOffset,
+ overRight = data.collisionPosition.left + data.collisionWidth - outerWidth - within.scrollLeft() - withinOffset,
left = data.my[ 0 ] === "left",
myOffset = data.my[ 0 ] === "left" ?
-data.elemWidth :
@@ -253,12 +253,12 @@ $.ui.position = {
if ( data.at[ 1 ] === center ) {
return;
}
- var win = data.within,
+ var within = data.within,
isWindow = $.isWindow( data.within[0] ),
- winOffset = isWindow ? 0 : win.offset().top,
- outerHeight = isWindow ? win.height() : win.outerHeight(),
- overTop = data.collisionPosition.top - winOffset,
- overBottom = data.collisionPosition.top + data.collisionHeight - outerHeight - win.scrollTop() - winOffset,
+ withinOffset = isWindow ? 0 : within.offset().top,
+ outerHeight = isWindow ? within.height() : within.outerHeight(),
+ overTop = data.collisionPosition.top - withinOffset,
+ overBottom = data.collisionPosition.top + data.collisionHeight - outerHeight - within.scrollTop() - withinOffset,
top = data.my[ 1 ] === "top",
myOffset = top ?
-data.elemHeight :