1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-20 08:37:59 +01:00

Fix zero-argument :qmarks form. Closes issue #26.

This commit is contained in:
Kris Maglione
2010-09-27 11:35:01 -04:00
parent 3d5f29fa59
commit e539e0b7ed
5 changed files with 25 additions and 20 deletions

View File

@@ -18,8 +18,8 @@ const CommandWidgets = Class("CommandWidgets", {
}); });
this.addElem({ this.addElem({
name: "commandline", name: "commandline",
getValue: function () this.command,
getGroup: function () options.get("guioptions").has("C") ? this.commandbar : this.statusbar, getGroup: function () options.get("guioptions").has("C") ? this.commandbar : this.statusbar,
getValue: function () this.command,
noValue: true, noValue: true,
}); });
this.addElem({ this.addElem({
@@ -129,7 +129,7 @@ const CommandWidgets = Class("CommandWidgets", {
for (let group in values([this.commandbar, this.statusbar])) { for (let group in values([this.commandbar, this.statusbar])) {
let meth, node = group[elem.name]; let meth, node = group[elem.name];
let visible = (value && group === activeGroup); let visible = (value && group === activeGroup);
if (!node.collapsed == !visible) { if (node && !node.collapsed == !visible) {
node.collapsed = !visible; node.collapsed = !visible;
if (elem.onVisibility) if (elem.onVisibility)
elem.onVisibility.call(this, node, visible); elem.onVisibility.call(this, node, visible);

View File

@@ -442,20 +442,28 @@ const CompletionContext = Class("CompletionContext", {
this.processor[0] = function (item, text) self.process[0].call(self, item, this.processor[0] = function (item, text) self.process[0].call(self, item,
template.highlightFilter(item.text, self.filter)); template.highlightFilter(item.text, self.filter));
// Item prototypes try {
let proto = this.proto; // Item prototypes
if (!this.cache.constructed) let proto = this.proto;
this.cache.constructed = items.map(function (item) Object.create(proto, { item: { value: item, enumerable: true } })); if (!this.cache.constructed)
this.cache.constructed = items.map(function (item) Object.create(proto, { item: { value: item, enumerable: true } }));
// Filters // Filters
let filtered = this.filterFunc(this.cache.constructed); let filtered = this.filterFunc(this.cache.constructed);
if (this.maxItems) if (this.maxItems)
filtered = filtered.slice(0, this.maxItems); filtered = filtered.slice(0, this.maxItems);
// Sorting // Sorting
if (this.sortResults && this.compare) if (this.sortResults && this.compare)
filtered.sort(this.compare); filtered.sort(this.compare);
return this.cache.filtered = filtered;
return this.cache.filtered = filtered;
}
catch (e) {
this.message = "Error: " + e;
dactyl.reportError(e);
return [];
}
}, },
get substrings() { get substrings() {

View File

@@ -157,7 +157,8 @@ const QuickMarks = Module("quickmarks", {
commands.add(["qmarks"], commands.add(["qmarks"],
"Show all QuickMarks", "Show all QuickMarks",
function (args) { function (args) {
args = args[0]; dactyl.dump(args);
args = args[0] || "";
// ignore invalid qmark characters unless there are no valid qmark chars // ignore invalid qmark characters unless there are no valid qmark chars
dactyl.assert(!args || /[a-zA-Z0-9]/.test(args), "E283: No QuickMarks matching " + args.quote()); dactyl.assert(!args || /[a-zA-Z0-9]/.test(args), "E283: No QuickMarks matching " + args.quote());

View File

@@ -41,6 +41,7 @@
* Added 'autocomplete' option for specifying which completion * Added 'autocomplete' option for specifying which completion
groups should be auto-completed. groups should be auto-completed.
* Added 'banghist' option. * Added 'banghist' option.
* Added BookmarkChange, BookmarkRemove autocommands.
* Added -keyword, -tags, -title to :delbmarks * Added -keyword, -tags, -title to :delbmarks
* Added 'hintkeys' option. * Added 'hintkeys' option.
* Replaced 'focuscontent' with 'strictfocus'. * Replaced 'focuscontent' with 'strictfocus'.

View File

@@ -25,11 +25,6 @@ BUGS:
(recent Mercurial regressions): (recent Mercurial regressions):
9 about:pentadactyl is currently about:undefined 9 about:pentadactyl is currently about:undefined
- messages is still broken in several ways - needs testing.
=> it often overwrites the open command line while editing etc.
- :messages is _very_ slow for message history of several thousand lines ->
Unresponsive Script: util.js:79 (sometimes xmlToDom() and elsewhere)
FEATURES: FEATURES:
9 Add quoting help tag 9 Add quoting help tag
8 Document Caret and Visual modes. 8 Document Caret and Visual modes.