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

Merge branch 'master' into vimperator-2.1

Browse Source 
Conflicts:
	common/content/io.js
This commit is contained in:
Kris Maglione
2008-12-24 13:27:00 -05:00
parent 313136a1f8 8294df5e81
commit baf1af72e5
21 changed files with 314 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/content/completion.js
View File

@@ -28,7 +28,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
/** @scope modules */
/**
/**
* Creates a new completion context.
*
* @class A class to provide contexts for command completion.
@@ -65,7 +65,7 @@ function CompletionContext(editor, name, offset) //{{{
else
self.contexts[name] = this;
/**
/**
* @property {CompletionContext} This context's parent. {null} when this is a top-level context.
*/
self.parent = parent;
@@ -497,7 +497,7 @@ CompletionContext.prototype = {
* advanced to match. If {@link #quote} is non-null, its prefix and suffix
* are set to the null-string.
*
* This function is still imperfect for quoted strings. When
* This function is still imperfect for quoted strings. When
* {@link #quote} is non-null, it adjusts the count based on the quoted
* size of the <b>count</b>-character substring of the filter, which is
* accurate so long as unquoting and quoting a string will always map to
@@ -1551,7 +1551,7 @@ function Completion() //{{{
location: function location(context)
{
if (!service["autoCompleteSearch"])
if (!services.get("autoCompleteSearch"))
return
context.anchored = false;
context.title = ["Smart Completions"];
@@ -1567,8 +1567,8 @@ function Completion() //{{{
for (i in util.range(0, result.matchCount))
];
});
service["autoCompleteSearch"].stopSearch();
service["autoCompleteSearch"].startSearch(context.filter, "", context.result, {
services.get("autoCompleteSearch").stopSearch();
services.get("autoCompleteSearch").startSearch(context.filter, "", context.result, {
onSearchResult: function onSearchResult(search, result)
{
context.result = result;
@@ -1651,7 +1651,7 @@ function Completion() //{{{
context.anchored = false;
context.title = ["Firefox Preference", "Value"];
context.keys = { text: function (item) item, description: function (item) options.getPref(item) };
context.completions = service["pref"].getChildList("", { value: 0 });
context.completions = services.get("pref").getChildList("", { value: 0 });
},
search: function search(context, noSuggest)
@@ -1702,7 +1702,7 @@ function Completion() //{{{
let completions = [];
engineList.forEach(function (name) {
let engine = service["browserSearch"].getEngineByAlias(name);
let engine = services.get("browserSearch").getEngineByAlias(name);
if (!engine)
return;
let [,word] = /^\s*(\S+)/.exec(context.filter) || [];
@@ -1725,7 +1725,7 @@ function Completion() //{{{
context.title = ["Shell Command", "Path"];
context.generate = function ()
{
let dirNames = service["environment"].get("PATH").split(RegExp(liberator.has("Win32") ? ";" : ":"));
let dirNames = services.get("environment").get("PATH").split(RegExp(liberator.has("Win32") ? ";" : ":"));
let commands = [];
for (let [,dirName] in Iterator(dirNames))