Browse Source

#2070 - dont continue loop unnecessarily, clarify variable names

pull/2169/head
jlukic 10 years ago
parent
commit
26fe5ba81c
1 changed files with 6 additions and 5 deletions
  1. 11
      src/definitions/modules/search.js

11
src/definitions/modules/search.js

@ -134,11 +134,12 @@ $.fn.search = function(parameters) {
href = $link.attr('href') || false, href = $link.attr('href') || false,
target = $link.attr('target') || false, target = $link.attr('target') || false,
title = $title.html(), title = $title.html(),
name = ($title.length > 0)
// title is used for result lookup
value = ($title.length > 0)
? $title.text() ? $title.text()
: false, : false,
results = module.get.results(), results = module.get.results(),
result = module.get.result(name, results),
result = module.get.result(value, results),
returnedValue returnedValue
; ;
if( $.isFunction(settings.onSelect) ) { if( $.isFunction(settings.onSelect) ) {
@ -148,8 +149,8 @@ $.fn.search = function(parameters) {
} }
} }
module.hideResults(); module.hideResults();
if(name) {
module.set.value(name);
if(value) {
module.set.value(value);
} }
if(href) { if(href) {
module.verbose('Opening search link found in result', $link); module.verbose('Opening search link found in result', $link);
@ -304,7 +305,7 @@ $.fn.search = function(parameters) {
if($.isArray(category.results)) { if($.isArray(category.results)) {
result = module.search.object(value, category.results, true)[0]; result = module.search.object(value, category.results, true)[0];
if(result && result.length > 0) { if(result && result.length > 0) {
return true;
return false;
} }
} }
}); });

Loading…
Cancel
Save