1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 23:22:26 +01:00

Fix favcons in completions, add "shutdown" trigger, register vimperator.css as user stylesheet, make option completions better, hide completion list when no completions available. Yeah. A lot. Sorry.

This commit is contained in:
Kris Maglione
2008-10-05 03:50:09 +00:00
parent 506838b41d
commit 55df63ee81
13 changed files with 157 additions and 170 deletions

View File

@@ -184,6 +184,9 @@ liberator.Bookmarks = function () //{{{
}
var cache = liberator.storage.newObject("bookmark-cache", Cache, false);
liberator.storage.addObserver("bookmark-cache", bookmarkObserver);
liberator.registerCallback("shutdown", 0, function () {
liberator.storage.removeObserver("bookmark-cache", bookmarkObserver)
});
/////////////////////////////////////////////////////////////////////////////}}}
////////////////////// OPTIONS /////////////////////////////////////////////////
@@ -416,11 +419,11 @@ liberator.Bookmarks = function () //{{{
{
var searchEngines = [];
var firefoxEngines = searchService.getVisibleEngines({});
for (let i in firefoxEngines)
for (let [,engine] in Iterator(firefoxEngines))
{
var alias = firefoxEngines[i].alias;
var alias = engine.alias;
if (!alias || !/^[a-z0-9_-]+$/.test(alias))
alias = firefoxEngines[i].name.replace(/^\W*([a-zA-Z_-]+).*/, "$1").toLowerCase();
alias = engine.name.replace(/^\W*([a-zA-Z_-]+).*/, "$1").toLowerCase();
if (!alias)
alias = "search"; // for search engines which we can't find a suitable alias
@@ -434,10 +437,10 @@ liberator.Bookmarks = function () //{{{
newAlias = alias + j;
}
// only write when it changed, writes are really slow
if (firefoxEngines[i].alias != newAlias)
firefoxEngines[i].alias = newAlias;
if (engine.alias != newAlias)
engine.alias = newAlias;
searchEngines.push([firefoxEngines[i].alias, firefoxEngines[i].description]);
searchEngines.push([engine.alias, engine.description, engine.iconURI.spec]);
}
return searchEngines;
@@ -500,16 +503,11 @@ liberator.Bookmarks = function () //{{{
{
url: item[0],
title: item[1],
extra: [['keyword', item[2], 'red'],
['tags', item[3].join(', '), 'blue']].filter(function (i) i[1])
extra: [['keyword', item[2], 'red'],
['tags', (item[3]||[]).join(', '), 'blue']].filter(function (i) i[1])
} for each (item in items)));
liberator.commandline.echo(list, liberator.commandline.HL_NORMAL, liberator.commandline.FORCE_MULTILINE);
},
destroy: function ()
{
liberator.storage.removeObserver("bookmark-cache", bookmarkObserver);
}
};
//}}}
}; //}}}