brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 571203 - Handle spaces in overlay search

Browse Source 
Previously we were stripping all whitespace.  Instead, just strip leading+trailing
whitespace, split the remaining search into individual terms which we search
for independently.

Items are grouped by the number of terms they match, then sorted
alphabetically.
This commit is contained in:
Colin Walters 2009-02-10 14:12:13 -05:00
parent 2d3988c5fc
commit 85dae56a31
4 changed files with 68 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/ui/appDisplay.js
View File

@ -178,15 +178,13 @@ AppDisplay.prototype = {
}
},
// Sorts the list of item ids in-place based on the alphabetical order of the names of
// the items associated with the ids.
_sortItems : function(itemIds) {
let me = this;
itemIds.sort(function (a,b) {
let appA = me._allItems[a];
let appB = me._allItems[b];
return appA.get_name().localeCompare(appB.get_name());
});
// Compares items associated with the item ids based on the alphabetical order
// of the item names.
// Returns an integer value indicating the result of the comparison.
_compareItems : function(itemIdA, itemIdB) {
let appA = this._allItems[itemIdA];
let appB = this._allItems[itemIdB];
return appA.get_name().localeCompare(appB.get_name());
},
// Checks if the item info can be a match for the search string by checking

35
js/ui/docDisplay.js
View File

@ -3,6 +3,7 @@
const Clutter = imports.gi.Clutter;
const Gio = imports.gi.Gio;
const Gtk = imports.gi.Gtk;
const Lang = imports.lang;
const Shell = imports.gi.Shell;
const Signals = imports.signals;
@ -153,7 +154,7 @@ DocDisplay.prototype = {
for (docId in this._allItems) {
docIds.push(docId);
}
this._sortItems(docIds);
docIds.sort(Lang.bind(this, function (a,b) { return this._compareItems(a,b); }));
let added = 0;
for (let i = 0; i < docIds.length && added < this._maxItems; i++) {
@ -166,23 +167,21 @@ DocDisplay.prototype = {
}
},
// Sorts the list of item ids in-place based on how recently the items associated with
// the ids were last visited.
_sortItems : function(itemIds) {
let me = this;
itemIds.sort(function (a,b) {
let docA = me._allItems[a];
let docB = me._allItems[b];
// We actually used get_modified() instead of get_visited() here, as GtkRecentInfo
// doesn't updated get_visited() correctly.
// See http://bugzilla.gnome.org/show_bug.cgi?id=567094
if (docA.get_modified() > docB.get_modified())
return -1;
else if (docA.get_modified() < docB.get_modified())
return 1;
else
return 0;
});
// Compares items associated with the item ids based on how recently the items
// were last visited.
// Returns an integer value indicating the result of the comparison.
_compareItems : function(itemIdA, itemIdB) {
let docA = this._allItems[itemIdA];
let docB = this._allItems[itemIdB];
// We actually used get_modified() instead of get_visited() here, as GtkRecentInfo
// doesn't updated get_visited() correctly.
// See http://bugzilla.gnome.org/show_bug.cgi?id=567094
if (docA.get_modified() > docB.get_modified())
return -1;
else if (docA.get_modified() < docB.get_modified())
return 1;
else
return 0;
},
// Checks if the item info can be a match for the search string by checking

54
js/ui/genericDisplay.js
View File

@ -6,8 +6,8 @@ const Gio = imports.gi.Gio;
const Gtk = imports.gi.Gtk;
const Lang = imports.lang;
const Pango = imports.gi.Pango;
const Shell = imports.gi.Shell;
const Signals = imports.signals;
const Shell = imports.gi.Shell;
const Tidy = imports.gi.Tidy;
const DND = imports.ui.dnd;
@ -391,9 +391,11 @@ GenericDisplay.prototype = {
throw new Error("Not implemented");
},
// Sorts the list of item ids in-place based on the order in which the items
// associated with the ids should be displayed.
_sortItems: function(itemIds) {
// Compares items associated with the item ids based on the order in which the
// items should be displayed.
// Intended to be used as a compareFunction for array.sort().
// Returns an integer value indicating the result of the comparison.
_compareItems: function(itemIdA, itemIdB) {
throw new Error("Not implemented");
},
@ -424,15 +426,43 @@ GenericDisplay.prototype = {
// and displays up to this._maxItems that matched.
_doSearchFilter: function() {
this._removeAllDisplayItems();
let matchedItems = [];
for (itemId in this._allItems) {
let item = this._allItems[itemId];
if (this._isInfoMatching(item, this._search))
matchedItems.push(itemId);
let matchedItems = {};
// Break the search up into terms, and search for each
// individual term. Keep track of the number of terms
// each item matched.
let terms = this._search.split(/\s+/);
for (let i = 0; i < terms.length; i++) {
let term = terms[i];
for (itemId in this._allItems) {
let item = this._allItems[itemId];
if (this._isInfoMatching(item, term)) {
let count = matchedItems[itemId];
if (!count)
count = 0;
count += 1;
matchedItems[itemId] = count;
}
}
}
this._sortItems(matchedItems);
for (let i = 0; i < matchedItems.length && i < this._maxItems; i++) {
this._addDisplayItem(matchedItems[i]);
let matchedList = [];
for (itemId in matchedItems) {
matchedList.push(itemId);
}
matchedList.sort(Lang.bind(this, function (a, b) {
let countA = matchedItems[a];
let countB = matchedItems[b];
if (countA > countB)
return -1;
else if (countA < countB)
return 1;
else
return this._compareItems(a, b);
}));
for (var i = 0; i < matchedList.length && i < this._maxItems; i++) {
this._addDisplayItem(matchedList[i]);
}
},

3
js/ui/overlay.js
View File

@ -119,7 +119,8 @@ Sideshow.prototype = {
if (me._searchQueued)
return;
Mainloop.timeout_add(250, function() {
let text = me._searchEntry.text.replace(/\s/g, "");
// Strip leading and trailing whitespace
let text = me._searchEntry.text.replace(/^\s+/g, "").replace(/\s+$/g, "");
me._searchQueued = false;
me._searchActive = text != '';
me._appDisplay.setSearch(text);