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

Closes issue #681.

Browse Source
This commit is contained in:
Kris Maglione
2011-10-06 01:15:17 -04:00
parent 1b781416c9
commit adea42d882
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common/content/commandline.js
View File

@@ -1093,15 +1093,17 @@ var CommandLine = Module("commandline", {
.filter(function (c) c.incomplete .filter(function (c) c.incomplete
|| c.hasItems && c.items.length), || c.hasItems && c.items.length),
// TODO: Remove.
get completion() { get completion() {
let str = commandline.command; let str = commandline.command;
return str.substring(this.prefix.length, str.length - this.suffix.length); return str.substring(this.prefix.length, str.length - this.suffix.length);
}, },
set completion(completion) { set completion(completion) {
this._completionItem = null;
this.previewClear(); this.previewClear();
// Change the completion text. // Change the completion text.
// The second line is a hack to deal with some substring // The third line is a hack to deal with some substring
// preview corner cases. // preview corner cases.
let value = this.prefix + completion + this.suffix; let value = this.prefix + completion + this.suffix;
commandline.widgets.active.command.value = value; commandline.widgets.active.command.value = value;
@@ -1115,6 +1117,16 @@ var CommandLine = Module("commandline", {
this._completion = completion; this._completion = completion;
}, },
get completionItem() this._completionItem,
set completionItem(tuple) {
let value = this.value;
if (tuple)
value = this.value.substr(0, tuple[0].offset - this.start)
+ tuple[0].items[tuple[1]].result;
this.completion = value;
this._completionItem = tuple;
},
get caret() this.editor.selection.getRangeAt(0).startOffset, get caret() this.editor.selection.getRangeAt(0).startOffset,
set caret(offset) { set caret(offset) {
this.editor.selection.getRangeAt(0).setStart(this.editor.rootElement.firstChild, offset); this.editor.selection.getRangeAt(0).setStart(this.editor.rootElement.firstChild, offset);
@@ -1211,6 +1223,7 @@ var CommandLine = Module("commandline", {
let cursor = this.selected; let cursor = this.selected;
if (cursor && cursor[0] == context) { if (cursor && cursor[0] == context) {
if (cursor[1] >= context.items.length if (cursor[1] >= context.items.length
// FIXME:
|| this.completion != context.items[cursor[1]].result) { || this.completion != context.items[cursor[1]].result) {
this.selected = null; this.selected = null;
this.itemList.select(null); this.itemList.select(null);
@@ -1351,11 +1364,11 @@ var CommandLine = Module("commandline", {
if (idx == null || !this.activeContexts.length) { if (idx == null || !this.activeContexts.length) {
// Wrapped. Start again. // Wrapped. Start again.
this.selected = null; this.selected = null;
this.completion = this.value; this.completionItem = null;
} }
else { else {
this.selected = idx; this.selected = idx;
this.completion = this.getItem().result; this.completionItem = idx;
} }
this.itemList.select(idx, null, position); this.itemList.select(idx, null, position);

1
common/modules/completion.jsm
View File

@@ -959,6 +959,7 @@ var Completion = Module("completion", {
if (/^about:/.test(context.filter)) if (/^about:/.test(context.filter))
context.fork("about", 6, this, function (context) { context.fork("about", 6, this, function (context) {
context.title = ["about:"];
context.generate = function () { context.generate = function () {
return [[k.substr(services.ABOUT.length), ""] return [[k.substr(services.ABOUT.length), ""]
for (k in Cc) for (k in Cc)