diff options
| author | Felix Nagel <info@felixnagel.com> | 2013-11-26 00:18:25 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2013-11-26 00:18:25 +0100 |
| commit | 5bc7fc2b1a248063b4d52086dfc32fae8601680e (patch) | |
| tree | 82c176a82f64ca3c1a26648b9e3bf0d2f7282dd8 /ui/jquery.ui.position.js | |
| parent | c20f1f8457802f90f8f06bcd2a33c340c2226b7c (diff) | |
| parent | 9a5f20bc7d5218f864fb65d5d20775596065280d (diff) | |
| download | jquery-ui-5bc7fc2b1a248063b4d52086dfc32fae8601680e.tar.gz jquery-ui-5bc7fc2b1a248063b4d52086dfc32fae8601680e.zip | |
Merge branch 'selectmenu' of github.com:jquery/jquery-ui into selectmenu
Diffstat (limited to 'ui/jquery.ui.position.js')
| -rw-r--r-- | ui/jquery.ui.position.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js index 15f168927..6ff37bd13 100644 --- a/ui/jquery.ui.position.js +++ b/ui/jquery.ui.position.js @@ -400,8 +400,7 @@ $.ui.position = { if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) { position.left += myOffset + atOffset + offset; } - } - else if ( overRight > 0 ) { + } else if ( overRight > 0 ) { newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft; if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) { position.left += myOffset + atOffset + offset; @@ -435,8 +434,7 @@ $.ui.position = { if ( ( position.top + myOffset + atOffset + offset) > overTop && ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) ) { position.top += myOffset + atOffset + offset; } - } - else if ( overBottom > 0 ) { + } else if ( overBottom > 0 ) { newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop; if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) { position.top += myOffset + atOffset + offset; @@ -457,7 +455,7 @@ $.ui.position = { }; // fraction support test -(function () { +(function() { var testElement, testElementParent, testElementStyle, offsetLeft, i, body = document.getElementsByTagName( "body" )[ 0 ], div = document.createElement( "div" ); |