Browse Source

Simplify function implementation

adaptive-webui-19844
Thomas Piccirello 5 years ago
parent
commit
feb1570c48
  1. 32
      src/webui/www/private/scripts/misc.js

32
src/webui/www/private/scripts/misc.js

@ -176,28 +176,18 @@ function toFixedPointString(number, digits) {
*/ */
function containsAllTerms(text, terms) { function containsAllTerms(text, terms) {
const textToSearch = text.toLowerCase(); const textToSearch = text.toLowerCase();
for (let i = 0; i < terms.length; ++i) { return terms.every((function(term) {
const term = terms[i].trim().toLowerCase(); const isTermRequired = (term[0] === '+');
if ((term[0] === '-')) { const isTermExcluded = (term[0] === '-');
// ignore lonely - if (isTermRequired || isTermExcluded) {
// ignore lonely +/-
if (term.length === 1) if (term.length === 1)
continue; return true;
// disallow any text after -
if (textToSearch.indexOf(term.substring(1)) !== -1) term = term.substring(1);
return false;
}
else if ((term[0] === '+')) {
// ignore lonely +
if (term.length === 1)
continue;
// require any text after +
if (textToSearch.indexOf(term.substring(1)) === -1)
return false;
}
else if (textToSearch.indexOf(term) === -1){
return false;
}
} }
return true; const textContainsTerm = (textToSearch.indexOf(term) !== -1);
return isTermExcluded ? !textContainsTerm : textContainsTerm;
}));
} }

Loading…
Cancel
Save