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: Refactor css parse calls

Browse Source
This commit is contained in:
Jörn Zaefferer 2012-04-12 17:10:51 +02:00
parent e1a80d5900
commit 58d5452a7c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,6 +56,9 @@ $.position = {
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;
}
};
@ -157,12 +160,10 @@ $.fn.position = function( options ) {
var elem = $( this ),
elemWidth = elem.outerWidth(),
elemHeight = elem.outerHeight(),
marginLeft = parseInt( $.css( this, "marginLeft" ), 10 ) || 0,
marginTop = parseInt( $.css( this, "marginTop" ), 10 ) || 0,
collisionWidth = elemWidth + marginLeft +
( parseInt( $.css( this, "marginRight" ), 10 ) || 0 ) + scrollInfo.width,
collisionHeight = elemHeight + marginTop +
( parseInt( $.css( this, "marginBottom" ), 10 ) || 0 ) + scrollInfo.height,
marginLeft = $.position.parseCss( this, "marginLeft" ),
marginTop = $.position.parseCss( this, "marginTop" ),
collisionWidth = elemWidth + marginLeft + $.position.parseCss( this, "marginRight" ) + scrollInfo.width,
collisionHeight = elemHeight + marginTop + $.position.parseCss( this, "marginBottom" ) + scrollInfo.height,
position = $.extend( {}, basePosition ),
myOffset = $.position.getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() ),
collisionPosition,