Optimising List.prototype.addSearchToQuery

Pylipala · Aug 17, 2015 · 479ffa1 · 479ffa1
1 parent dc7a5f5
commit 479ffa1
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/lib/list/addSearchToQuery.js b/lib/list/addSearchToQuery.js
@@ -28,18 +28,12 @@ function addSearchToQuery (searchString, query) {
 	query = query || {};
 	if (!searchString) return query;
 
-	var searchFields = listToArray(this.get('searchFields'));
 	var searchRegExp = new RegExp(utils.escapeRegExp(searchString), 'i');
-
-	var searchFilters = searchFields.map(function (path) {
-		if (path === '__name__') {
-			path = this.mappings.name;
-		}
-		var field = this.fields[path];
-		if (field && field.type === 'name') {
-			return getNameFilter(field, searchString);
+	var searchFilters = this.searchFields.map(function (i) {
+		if (i.field && i.field.type === 'name') {
+			return getNameFilter(i.field, searchString);
 		} else {
-			return getStringFilter(path, searchRegExp);
+			return getStringFilter(i.path, searchRegExp);
 		}
 	}, this);