gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 09:48:00 +01:00
Code Issues Projects Releases Wiki Activity

Changed 'complete' option default to "sfl", meaning we have awesomebar completions by default now.

Browse Source 
In constrast removed history cache, which should make startup faster and use less memory. As we only need it for :history anyway, there is no real performance penalty as Places does search quite fast.
This commit is contained in:
Martin Stubenschrott
2008-11-20 19:46:38 +00:00
parent 069a8e57f1
commit cd2c0d6c6d
5 changed files with 61 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
content/completion.js
View File

@@ -164,7 +164,7 @@ function Completion() //{{{
let orig = obj;
if (obj.wrappedJSObject)
obj = obj.wrappedJSObject;
compl.push([v for (v in this.iter(obj)) if (v[0] in orig || orig[v[0]])])
compl.push([v for (v in this.iter(obj)) if (v[0] in orig)])
// And if wrappedJSObject happens to be available,
// return that, too.
if (orig.wrappedJSObject)
@@ -1063,30 +1063,33 @@ function Completion() //{{{
let keywords = bookmarks.getKeywords();
let engines = this.filter(keywords.concat(bookmarks.getSearchEngines()), filter, false, true);
let generate = function () {
let hist = history.get();
let searches = [];
for (let [, k] in Iterator(keywords))
{
if (k.keyword.toLowerCase() != keyword.toLowerCase() || k.url.indexOf("%s") == -1)
continue;
let [begin, end] = k.url.split("%s");
for (let [, h] in Iterator(hist))
{
if (h.url.indexOf(begin) == 0 && (!end.length || h.url.substr(-end.length) == end))
{
let query = h.url.substring(begin.length, h.url.length - end.length);
searches.push([decodeURIComponent(query.replace("+", "%20")),
<>{begin}<span class="hl-Filter">{query}</span>{end}</>,
k.icon]);
}
}
}
return searches;
}
let searches = this.cached("searches-" + keyword, args, generate, "filter", [false, true]);
searches = searches.map(function (a) (a = a.concat(), a[0] = keyword + " " + a[0], a));
return [0, searches.concat(engines)];
// NOTE: While i like the result of the code, due to the History simplification
// that code is too slow to be here. We might use a direct Places History query instead for better speed
// let generate = function () {
// let hist = history.get();
// let searches = [];
// for (let [, k] in Iterator(keywords))
// {
// if (k.keyword.toLowerCase() != keyword.toLowerCase() || k.url.indexOf("%s") == -1)
// continue;
// let [begin, end] = k.url.split("%s");
// for (let [, h] in Iterator(hist))
// {
// if (h.url.indexOf(begin) == 0 && (!end.length || h.url.substr(-end.length) == end))
// {
// let query = h.url.substring(begin.length, h.url.length - end.length);
// searches.push([decodeURIComponent(query.replace("+", "%20")),
// <>{begin}<span class="hl-Filter">{query}</span>{end}</>,
// k.icon]);
// }
// }
// }
// return searches;
// }
// let searches = this.cached("searches-" + keyword, args, generate, "filter", [false, true]);
// searches = searches.map(function (a) (a = a.concat(), a[0] = keyword + " " + a[0], a));
// return [0, searches.concat(engines)];
return [0, engines];
},
// XXX: Move to bookmarks.js?
@@ -1260,8 +1263,6 @@ function Completion() //{{{
completions = completions.concat(this.searchEngineSuggest(filter, suggestEngineAlias)[1]);
else if (c == "b")
completions = completions.concat(bookmarks.get(filter));
else if (c == "h")
completions = completions.concat(history.get(filter));
else if (c == "l" && completionService) // add completions like Firefox's smart location bar
{
historyCache = [];