summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2012-08-06 13:52:25 -0700
committerFelix Nagel <info@felixnagel.com>2012-08-06 13:52:25 -0700
commit80c400ad5a95d54eedd5bab8e10e14d870193e05 (patch)
tree748e734a8f96fe4bb18931579c6a186e3095f7f0
parent690fcb3c47037df49eccaed6f87293e9abe3abec (diff)
parent550eec9d94cc47635957f0f70b2c53e39b0513c7 (diff)
downloadjquery-ui-80c400ad5a95d54eedd5bab8e10e14d870193e05.tar.gz
jquery-ui-80c400ad5a95d54eedd5bab8e10e14d870193e05.zip
Merge pull request #255 from betalb/patch-2
fixes: operator precedence when using own collision option
-rw-r--r--ui/jquery.ui.selectmenu.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/jquery.ui.selectmenu.js b/ui/jquery.ui.selectmenu.js
index 527d40eae..ae0a953fc 100644
--- a/ui/jquery.ui.selectmenu.js
+++ b/ui/jquery.ui.selectmenu.js
@@ -868,7 +868,7 @@ $.widget("ui.selectmenu", {
my: o.positionOptions.my,
at: o.positionOptions.at,
offset: o.positionOptions.offset || _offset,
- collision: o.positionOptions.collision || o.style == "popup" ? 'fit' :'flip'
+ collision: o.positionOptions.collision || (o.style == "popup" ? 'fit' :'flip')
});
}
});