mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2026-01-27 17:35:46 +01:00
Fix zero-argument :qmarks form. Closes issue #26.
This commit is contained in:
@@ -18,8 +18,8 @@ const CommandWidgets = Class("CommandWidgets", {
|
||||
});
|
||||
this.addElem({
|
||||
name: "commandline",
|
||||
getValue: function () this.command,
|
||||
getGroup: function () options.get("guioptions").has("C") ? this.commandbar : this.statusbar,
|
||||
getValue: function () this.command,
|
||||
noValue: true,
|
||||
});
|
||||
this.addElem({
|
||||
@@ -129,7 +129,7 @@ const CommandWidgets = Class("CommandWidgets", {
|
||||
for (let group in values([this.commandbar, this.statusbar])) {
|
||||
let meth, node = group[elem.name];
|
||||
let visible = (value && group === activeGroup);
|
||||
if (!node.collapsed == !visible) {
|
||||
if (node && !node.collapsed == !visible) {
|
||||
node.collapsed = !visible;
|
||||
if (elem.onVisibility)
|
||||
elem.onVisibility.call(this, node, visible);
|
||||
|
||||
@@ -442,20 +442,28 @@ const CompletionContext = Class("CompletionContext", {
|
||||
this.processor[0] = function (item, text) self.process[0].call(self, item,
|
||||
template.highlightFilter(item.text, self.filter));
|
||||
|
||||
// Item prototypes
|
||||
let proto = this.proto;
|
||||
if (!this.cache.constructed)
|
||||
this.cache.constructed = items.map(function (item) Object.create(proto, { item: { value: item, enumerable: true } }));
|
||||
try {
|
||||
// Item prototypes
|
||||
let proto = this.proto;
|
||||
if (!this.cache.constructed)
|
||||
this.cache.constructed = items.map(function (item) Object.create(proto, { item: { value: item, enumerable: true } }));
|
||||
|
||||
// Filters
|
||||
let filtered = this.filterFunc(this.cache.constructed);
|
||||
if (this.maxItems)
|
||||
filtered = filtered.slice(0, this.maxItems);
|
||||
// Filters
|
||||
let filtered = this.filterFunc(this.cache.constructed);
|
||||
if (this.maxItems)
|
||||
filtered = filtered.slice(0, this.maxItems);
|
||||
|
||||
// Sorting
|
||||
if (this.sortResults && this.compare)
|
||||
filtered.sort(this.compare);
|
||||
return this.cache.filtered = filtered;
|
||||
// Sorting
|
||||
if (this.sortResults && this.compare)
|
||||
filtered.sort(this.compare);
|
||||
|
||||
return this.cache.filtered = filtered;
|
||||
}
|
||||
catch (e) {
|
||||
this.message = "Error: " + e;
|
||||
dactyl.reportError(e);
|
||||
return [];
|
||||
}
|
||||
},
|
||||
|
||||
get substrings() {
|
||||
|
||||
@@ -157,7 +157,8 @@ const QuickMarks = Module("quickmarks", {
|
||||
commands.add(["qmarks"],
|
||||
"Show all QuickMarks",
|
||||
function (args) {
|
||||
args = args[0];
|
||||
dactyl.dump(args);
|
||||
args = args[0] || "";
|
||||
|
||||
// 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());
|
||||
|
||||
Reference in New Issue
Block a user