Merge pull request fnagel#255 from betalb/patch-2

fnagel · fnagel · commit 80c400ad5a95 · 2012-08-06T13:52:25.000-07:00
fixes: operator precedence when using own collision option
diff --git 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')
 			});
 	}
 });

Original file line number	Diff line number	Diff line change
`@@ -868,7 +868,7 @@ $.widget("ui.selectmenu", {`
`868`	`868`	`my: o.positionOptions.my,`
`869`	`869`	`at: o.positionOptions.at,`
`870`	`870`	`offset: o.positionOptions.offset \|\| _offset,`
`871`		`- collision: o.positionOptions.collision \|\| o.style == "popup" ? 'fit' :'flip'`
	`871`	`+ collision: o.positionOptions.collision \|\| (o.style == "popup" ? 'fit' :'flip')`
`872`	`872`	`});`
`873`	`873`	`}`
`874`	`874`	`});`