isa/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
Download Patch File Download Diff File Expand all files Collapse all files

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