library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Position: Make getOffsets and parseCss helpers local functions, no need to expose those

Browse Source
This commit is contained in:
Jörn Zaefferer 2012-04-18 00:30:47 +02:00
parent db592b787e
commit f594c0623a
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,16 @@ var rhorizontal = /left|center|right/,
_position = $.fn.position, _position = $.fn.position,
cachedScrollbarWidth; cachedScrollbarWidth;
function getOffsets( offsets, width, height ) {
return [
parseInt( offsets[ 0 ], 10 ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ),
parseInt( offsets[ 1 ], 10 ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 )
];
}
function parseCss( element, property ) {
return parseInt( $.css( element, property ), 10 ) || 0;
}
$.position = { $.position = {
scrollbarWidth: function() { scrollbarWidth: function() {
if ( cachedScrollbarWidth !== undefined ) { if ( cachedScrollbarWidth !== undefined ) {
@ -65,15 +75,6 @@ $.position = {
width: isWindow ? withinElement.width() : withinElement.outerWidth(), width: isWindow ? withinElement.width() : withinElement.outerWidth(),
height: isWindow ? withinElement.height() : withinElement.outerHeight() height: isWindow ? withinElement.height() : withinElement.outerHeight()
}; };
},
getOffsets: function( offsets, width, height ) {
return [
parseInt( offsets[ 0 ], 10 ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ),
parseInt( offsets[ 1 ], 10 ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 )
];
},
parseCss: function( element, property ) {
return parseInt( $.css( element, property ), 10 ) || 0;
} }
}; };
@ -167,7 +168,7 @@ $.fn.position = function( options ) {
basePosition.top += targetHeight / 2; basePosition.top += targetHeight / 2;
} }
atOffset = $.position.getOffsets( offsets.at, targetWidth, targetHeight ); atOffset = getOffsets( offsets.at, targetWidth, targetHeight );
basePosition.left += atOffset[ 0 ]; basePosition.left += atOffset[ 0 ];
basePosition.top += atOffset[ 1 ]; basePosition.top += atOffset[ 1 ];
@ -175,12 +176,12 @@ $.fn.position = function( options ) {
var elem = $( this ), var elem = $( this ),
elemWidth = elem.outerWidth(), elemWidth = elem.outerWidth(),
elemHeight = elem.outerHeight(), elemHeight = elem.outerHeight(),
marginLeft = $.position.parseCss( this, "marginLeft" ), marginLeft = parseCss( this, "marginLeft" ),
marginTop = $.position.parseCss( this, "marginTop" ), marginTop = parseCss( this, "marginTop" ),
collisionWidth = elemWidth + marginLeft + $.position.parseCss( this, "marginRight" ) + scrollInfo.width, collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) + scrollInfo.width,
collisionHeight = elemHeight + marginTop + $.position.parseCss( this, "marginBottom" ) + scrollInfo.height, collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) + scrollInfo.height,
position = $.extend( {}, basePosition ), position = $.extend( {}, basePosition ),
myOffset = $.position.getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() ), myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() ),
collisionPosition, collisionPosition,
using; using;