From aed1e67addc8e9661cb34856d42713d2f1d44a58 Mon Sep 17 00:00:00 2001 From: Marina Zhurakhinskaya Date: Mon, 5 Oct 2009 13:50:58 -0400 Subject: [PATCH] Check that no new term was introduced before doing a subsearch We combine search terms with OR, so if a new search term is introduced, the search results are no longer a subset of the previous search results. --- js/ui/genericDisplay.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/ui/genericDisplay.js b/js/ui/genericDisplay.js index e15df20a4..cbd211fb0 100644 --- a/js/ui/genericDisplay.js +++ b/js/ui/genericDisplay.js @@ -370,7 +370,11 @@ GenericDisplay.prototype = { return; let flags = RedisplayFlags.RESET_CONTROLS; if (this._search != '') { - if (lowertext.indexOf(this._search) == 0) + // Because we combine search terms with OR, we have to be sure that no new term + // was introduced before deciding that the new search results will be a subset of + // the existing search results. + if (lowertext.indexOf(this._search) == 0 && + lowertext.split(/\s+/).length == this._search.split(/\s+/).length) flags |= RedisplayFlags.SUBSEARCH; } this._search = lowertext;