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 1 Packages Projects Releases Wiki Activity

Position: Also create a local reference for Math.round; update other Math references

Browse Source
This commit is contained in:
Jörn Zaefferer 2012-04-20 14:15:57 +02:00
parent cfa6aa328e
commit 3b73177d0c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ $.ui = $.ui || {};
var cachedScrollbarWidth, var cachedScrollbarWidth,
max = Math.max, max = Math.max,
abs = Math.abs, abs = Math.abs,
round = Math.round,
rhorizontal = /left|center|right/, rhorizontal = /left|center|right/,
rvertical = /top|center|bottom/, rvertical = /top|center|bottom/,
roffset = /[\+\-]\d+%?/, roffset = /[\+\-]\d+%?/,
@ -199,8 +200,8 @@ $.fn.position = function( options ) {
// if the browser doesn't support fractions, then round for consistent results // if the browser doesn't support fractions, then round for consistent results
if ( !$.support.offsetFractions ) { if ( !$.support.offsetFractions ) {
position.left = Math.round( position.left ); position.left = round( position.left );
position.top = Math.round( position.top ); position.top = round( position.top );
} }
collisionPosition = { collisionPosition = {
@ -312,7 +313,7 @@ $.ui.position = {
position.left -= overRight; position.left -= overRight;
// adjust based on position and margin // adjust based on position and margin
} else { } else {
position.left = Math.max( position.left - collisionPosLeft, position.left ); position.left = max( position.left - collisionPosLeft, position.left );
} }
}, },
top: function( position, data ) { top: function( position, data ) {
@ -350,7 +351,7 @@ $.ui.position = {
position.top -= overBottom; position.top -= overBottom;
// adjust based on position and margin // adjust based on position and margin
} else { } else {
position.top = Math.max( position.top - collisionPosTop, position.top ); position.top = max( position.top - collisionPosTop, position.top );
} }
} }
}, },
@ -382,13 +383,13 @@ $.ui.position = {
if ( overLeft < 0 ) { if ( overLeft < 0 ) {
newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - outerWidth - withinOffset; newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - outerWidth - withinOffset;
if ( newOverRight < 0 || newOverRight < Math.abs( overLeft ) ) { if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) {
position.left += myOffset + atOffset + offset; position.left += myOffset + atOffset + offset;
} }
} }
else if ( overRight > 0 ) { else if ( overRight > 0 ) {
newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft; newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft;
if ( newOverLeft > 0 || Math.abs( newOverLeft ) < overRight ) { if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) {
position.left += myOffset + atOffset + offset; position.left += myOffset + atOffset + offset;
} }
} }
@ -419,13 +420,13 @@ $.ui.position = {
newOverBottom; newOverBottom;
if ( overTop < 0 ) { if ( overTop < 0 ) {
newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset; newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset;
if ( ( position.top + myOffset + atOffset + offset) > overTop && ( newOverBottom < 0 || newOverBottom < Math.abs( overTop ) ) ) { if ( ( position.top + myOffset + atOffset + offset) > overTop && ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) ) {
position.top += myOffset + atOffset + offset; position.top += myOffset + atOffset + offset;
} }
} }
else if ( overBottom > 0 ) { else if ( overBottom > 0 ) {
newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop; newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || Math.abs( newOverTop ) < overBottom ) ) { if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) {
position.top += myOffset + atOffset + offset; position.top += myOffset + atOffset + offset;
} }
} }