Position: Fixed calculation of collision dimensions. Fixes #6812 - Position: Collision detection fails on the right side in Internet Explorer.

This commit is contained in:
Scott González 2011-01-12 08:43:18 -05:00
parent b6ed9328ef
commit c1cc00f609

View File

@ -82,7 +82,7 @@ $.fn.position = function( options ) {
if ( options.at[0] === "right" ) { if ( options.at[0] === "right" ) {
basePosition.left += targetWidth; basePosition.left += targetWidth;
} else if (options.at[0] === center ) { } else if ( options.at[0] === center ) {
basePosition.left += targetWidth / 2; basePosition.left += targetWidth / 2;
} }
@ -102,9 +102,9 @@ $.fn.position = function( options ) {
marginLeft = parseInt( $.curCSS( this, "marginLeft", true ) ) || 0, marginLeft = parseInt( $.curCSS( this, "marginLeft", true ) ) || 0,
marginTop = parseInt( $.curCSS( this, "marginTop", true ) ) || 0, marginTop = parseInt( $.curCSS( this, "marginTop", true ) ) || 0,
collisionWidth = elemWidth + marginLeft + collisionWidth = elemWidth + marginLeft +
parseInt( $.curCSS( this, "marginRight", true ) ) || 0, ( parseInt( $.curCSS( this, "marginRight", true ) ) || 0 ),
collisionHeight = elemHeight + marginTop + collisionHeight = elemHeight + marginTop +
parseInt( $.curCSS( this, "marginBottom", true ) ) || 0, ( parseInt( $.curCSS( this, "marginBottom", true ) ) || 0 ),
position = $.extend( {}, basePosition ), position = $.extend( {}, basePosition ),
collisionPosition; collisionPosition;