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

Merge branch 'master' into vimperator-2.1

Browse Source 
Conflicts:
	common/content/liberator.js
This commit is contained in:
Kris Maglione
2008-12-21 16:15:16 -05:00
parent f7b3865b99 fbb1f33fab
commit 782a28f47a
29 changed files with 554 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/content/ui.js
View File

@@ -660,9 +660,8 @@ function CommandLine() //{{{
{
completer: function completer(value)
{
let ss = Cc["@mozilla.org/browser/search-service;1"].getService(Ci.nsIBrowserSearchService);
let engines = ss.getEngines({})
.filter(function (engine) engine.supportsResponseType("application/x-suggestions+json"));
let engines = service["browserSearch"].getEngines({})
.filter(function (engine) engine.supportsResponseType("application/x-suggestions+json"));
return engines.map(function (engine) [engine.alias, engine.description]);
},
@@ -809,7 +808,7 @@ function CommandLine() //{{{
command.description,
function (args)
{
var str = echoArgumentToString(args.string, true);
let str = echoArgumentToString(args.string, true);
if (str != null)
command.action(str);
},
@@ -1812,6 +1811,7 @@ function StatusLine() //{{{
}
else
{
url = url.replace(RegExp("^chrome://liberator/locale/(\\S+\\.html)#(.*)"), function (m, n1, n2) n1 + " " + decodeURIComponent(n2) + " [Help]");
url = url.replace(RegExp("^chrome://liberator/locale/(\\S+\\.html)"), "$1 [Help]");
}