Added "searchConjunction" option (selectize#119).

brianreavis · brianreavis · commit 1c7cc13a7f79 · 2013-10-11T20:50:35.000-07:00
diff --git a/bower.json b/bower.json
@@ -29,7 +29,7 @@
 	],
 	"dependencies": {
 		"jquery": ">=0.6.0",
-		"sifter": "0.2.x",
+		"sifter": "0.3.x",
 		"microplugin": "0.0.x"
 	},
 	"devDependencies": {
diff --git a/docs/usage.md b/docs/usage.md
@@ -170,6 +170,12 @@ $(function() {
 		<td valign="top"><code>array</code></td>
 		<td valign="top"><code>['text']</code></td>
 	</tr>
+	<tr>
+		<td valign="top"><code>searchConjunction</td>
+		<td valign="top">When searching for multiple terms (separated by a space), this is the operator used. Can be "and" or "or".</td>
+		<td valign="top"><code>string</code></td>
+		<td valign="top"><code>'and'</code></td>
+	</tr>
 	<tr>
 		<td valign="top"><code>optgroupOrder</td>
 		<td valign="top">An array of optgroup values that indicates the order they should be listed in in the dropdown. If not provided, groups will be ordered by the ranking of the options within them.</td>
diff --git a/src/defaults.js b/src/defaults.js
@@ -26,6 +26,7 @@ Selectize.defaults = {
 	optgroupValueField: 'value',
 	optgroupOrder: null,
 	searchField: ['text'],
+	searchConjunction: 'and',
 
 	mode: null,
 	wrapperClass: 'selectize-control',
diff --git a/src/selectize.js b/src/selectize.js
@@ -831,8 +831,9 @@ $.extend(Selectize.prototype, {
 		var settings = this.settings;
 
 		return {
-			fields : settings.searchField,
-			sort   : settings.sortField
+			fields      : settings.searchField,
+			conjunction : settings.searchConjunction,
+			sort        : settings.sortField
 		};
 	},
 
