library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-10-05 01:44:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Position: Fix single var, whitespace. Clone targetOffset to avoid reading that twice

Browse Source
This commit is contained in:
Jörn Zaefferer 2012-04-10 23:41:41 +02:00
parent e5ba731019
commit c0cceee8e4
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ui/jquery.ui.position.js vendored
View File

@ -69,26 +69,29 @@ $.fn.position = function( options ) {
atOffset, atOffset,
targetWidth, targetWidth,
targetHeight, targetHeight,
targetOffset,
basePosition; basePosition;
if ( targetElem.nodeType === 9 ) { if ( targetElem.nodeType === 9 ) {
targetWidth = target.width(); targetWidth = target.width();
targetHeight = target.height(); targetHeight = target.height();
basePosition = { top: 0, left: 0 }; targetOffset = { top: 0, left: 0 };
} else if ( $.isWindow( targetElem ) ) { } else if ( $.isWindow( targetElem ) ) {
targetWidth = target.width(); targetWidth = target.width();
targetHeight = target.height(); targetHeight = target.height();
basePosition = { top: target.scrollTop(), left: target.scrollLeft() }; targetOffset = { top: target.scrollTop(), left: target.scrollLeft() };
} else if ( targetElem.preventDefault ) { } else if ( targetElem.preventDefault ) {
// force left top to allow flipping // force left top to allow flipping
options.at = "left top"; options.at = "left top";
targetWidth = targetHeight = 0; targetWidth = targetHeight = 0;
basePosition = { top: options.of.pageY, left: options.of.pageX }; targetOffset = { top: options.of.pageY, left: options.of.pageX };
} else { } else {
targetWidth = target.outerWidth(); targetWidth = target.outerWidth();
targetHeight = target.outerHeight(); targetHeight = target.outerHeight();
basePosition = target.offset(); targetOffset = target.offset();
} }
// clone to reuse original targetOffset later
basePosition = $.extend( {}, targetOffset );
// force my and at to have valid horizontal and vertical positions // force my and at to have valid horizontal and vertical positions
// if a value is missing or invalid, it will be converted to center // if a value is missing or invalid, it will be converted to center
@ -166,7 +169,8 @@ $.fn.position = function( options ) {
parseInt( offsets.my[ 1 ], 10 ) * parseInt( offsets.my[ 1 ], 10 ) *
( rpercent.test( offsets.my[ 1 ] ) ? elem.outerHeight() / 100 : 1 ) ( rpercent.test( offsets.my[ 1 ] ) ? elem.outerHeight() / 100 : 1 )
], ],
collisionPosition; collisionPosition,
using = options.using;
if ( options.my[ 0 ] === "right" ) { if ( options.my[ 0 ] === "right" ) {
position.left -= elemWidth; position.left -= elemWidth;
@ -216,20 +220,19 @@ $.fn.position = function( options ) {
if ( $.fn.bgiframe ) { if ( $.fn.bgiframe ) {
elem.bgiframe(); elem.bgiframe();
} }
var using = options.using;
if ( using ) { if ( using ) {
// we have to proxy, as jQuery.offset.setOffset throws away other props then left/top // we have to proxy, as jQuery.offset.setOffset throws away props other than left/top
options.using = function( props ) { options.using = function( props ) {
// can't use basePosition, as that gets modified var left = targetOffset.left - props.left,
var targetOffset = target.offset(),
left = targetOffset.left - props.left,
right = (targetOffset.left + targetWidth) - (props.left + elemWidth), right = (targetOffset.left + targetWidth) - (props.left + elemWidth),
top = targetOffset.top - props.top, top = targetOffset.top - props.top,
bottom = (targetOffset.top + targetHeight) - (props.top + elemHeight); bottom = (targetOffset.top + targetHeight) - (props.top + elemHeight),
var feedback = {}; feedback = {
feedback.horizontal = right < 0 ? "left" : left > 0 ? "right" : "center"; horizontal: right < 0 ? "left" : left > 0 ? "right" : "center",
feedback.vertical = bottom < 0 ? "top" : top > 0 ? "bottom" : "middle"; vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle"
if (Math.max(Math.abs(left), Math.abs(right)) > Math.max(Math.abs(top), Math.abs(bottom))) { };
if ( Math.max( Math.abs( left ), Math.abs( right ) ) > Math.max( Math.abs( top ), Math.abs( bottom ) ) ) {
feedback.important = "horizontal"; feedback.important = "horizontal";
} else { } else {
feedback.important = "vertical"; feedback.important = "vertical";
@ -237,6 +240,7 @@ $.fn.position = function( options ) {
using.call( this, props, feedback ); using.call( this, props, feedback );
}; };
} }
elem.offset( $.extend( position, { using: options.using } ) ); elem.offset( $.extend( position, { using: options.using } ) );
}); });
}; };