[gnome-shell] Check that no new term was introduced before doing a subsearch
- From: Marina Zhurakhinskaya <marinaz src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-shell] Check that no new term was introduced before doing a subsearch
- Date: Mon, 5 Oct 2009 17:53:32 +0000 (UTC)
commit aed1e67addc8e9661cb34856d42713d2f1d44a58
Author: Marina Zhurakhinskaya <marinaz redhat com>
Date: Mon Oct 5 13:50:58 2009 -0400
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 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/js/ui/genericDisplay.js b/js/ui/genericDisplay.js
index e15df20..cbd211f 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]