aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.position.js
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2013-11-16 12:25:21 +0100
committerJörn Zaefferer <joern.zaefferer@gmail.com>2013-11-16 12:25:21 +0100
commit43772f3e5bb531d917bec884bfbd0be196110fd8 (patch)
treed60d96a569eb47f901b8a800a8fc0f0f95e6c70e /ui/jquery.ui.position.js
parent0be76bbcfd7a2092aca1b4b01b90dab4e4fe00da (diff)
parent9fd0e86820dcea532d5357e0b814653746d62889 (diff)
downloadjquery-ui-43772f3e5bb531d917bec884bfbd0be196110fd8.tar.gz
jquery-ui-43772f3e5bb531d917bec884bfbd0be196110fd8.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.position.js')
-rw-r--r--ui/jquery.ui.position.js8
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" );