Browse Source

Minor re-ordering

pull/2158/merge
jlukic 10 years ago
parent
commit
bdf1f0a387
1 changed files with 9 additions and 8 deletions
  1. 17
      src/definitions/modules/search.js

17
src/definitions/modules/search.js

@ -455,9 +455,6 @@ $.fn.search = function(parameters) {
fuzzyResults = [],
searchExp = searchTerm.toString().replace(regExp.escape, '\\$&'),
matchRegExp = new RegExp(regExp.beginsWith + searchExp, 'i'),
searchFields = (searchFields !== undefined)
? searchFields
: settings.searchFields,
// avoid duplicates when pushing results
addResult = function(array, result) {
@ -471,6 +468,15 @@ $.fn.search = function(parameters) {
}
;
source = source || settings.source;
searchFields = (searchFields !== undefined)
? searchFields
: settings.searchFields
;
// search fields should be array to loop correctly
if(!$.isArray(searchFields)) {
searchFields = [searchFields];
}
// exit conditions if no source
if(source === undefined) {
@ -478,11 +484,6 @@ $.fn.search = function(parameters) {
return [];
}
// search fields should be array to loop correctly
if(!$.isArray(searchFields)) {
searchFields = [searchFields];
}
// iterate through search fields looking for matches
$.each(searchFields, function(index, field) {
$.each(source, function(label, content) {

Loading…
Cancel
Save