aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2011-01-12 08:43:18 -0500
committerScott González <scott.gonzalez@gmail.com>2011-01-12 08:43:34 -0500
commitca46a3a8a9353e50e517ece4273639637e5b3cf1 (patch)
tree28e48bc9105e66d240191c9166b915f667920d0e
parent1f0fd61b4e8372be63ccf9e88c6428bf47e0d9a4 (diff)
downloadjquery-ui-ca46a3a8a9353e50e517ece4273639637e5b3cf1.tar.gz
jquery-ui-ca46a3a8a9353e50e517ece4273639637e5b3cf1.zip
Position: Fixed calculation of collision dimensions. Fixes #6812 - Position: Collision detection fails on the right side in Internet Explorer.
-rw-r--r--ui/jquery.ui.position.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js
index 9d490d274..fa0d05282 100644
--- a/ui/jquery.ui.position.js
+++ b/ui/jquery.ui.position.js
@@ -83,7 +83,7 @@ $.fn.position = function( options ) {
if ( options.at[0] === "right" ) {
basePosition.left += targetWidth;
- } else if (options.at[0] === center ) {
+ } else if ( options.at[0] === center ) {
basePosition.left += targetWidth / 2;
}
@@ -103,9 +103,9 @@ $.fn.position = function( options ) {
marginLeft = parseInt( $.curCSS( this, "marginLeft", true ) ) || 0,
marginTop = parseInt( $.curCSS( this, "marginTop", true ) ) || 0,
collisionWidth = elemWidth + marginLeft +
- parseInt( $.curCSS( this, "marginRight", true ) ) || 0,
+ ( parseInt( $.curCSS( this, "marginRight", true ) ) || 0 ),
collisionHeight = elemHeight + marginTop +
- parseInt( $.curCSS( this, "marginBottom", true ) ) || 0,
+ ( parseInt( $.curCSS( this, "marginBottom", true ) ) || 0 ),
position = $.extend( {}, basePosition ),
collisionPosition;