1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 15:02:26 +01:00

:macros argCount "1" -> "?"

This commit is contained in:
Kris Maglione
2008-11-29 13:13:54 +00:00
parent 5e34333db9
commit b6c5bea5a1
2 changed files with 9 additions and 9 deletions

View File

@@ -716,7 +716,7 @@ function Events() //{{{
"List all macros", "List all macros",
function (args) { completion.listCompleter("macro", args[0]) }, function (args) { completion.listCompleter("macro", args[0]) },
{ {
argCount: "1", argCount: "?",
completer: function (context) completion.macro(context), completer: function (context) completion.macro(context),
}); });

View File

@@ -830,6 +830,7 @@ const liberator = (function () //{{{
if (window != ww.activeWindow) if (window != ww.activeWindow)
return; return;
let elem = config.mainWidget || window.content;
// TODO: make more generic // TODO: make more generic
try try
{ {
@@ -840,16 +841,15 @@ const liberator = (function () //{{{
i = 0; i = 0;
gDBView.selection.select(i); gDBView.selection.select(i);
} }
if (this.has("tabs"))
{
let frame = tabs.localStore.focusedFrame;
if (frame && frame.top == window.content)
elem = frame;
}
} }
catch (e) {} catch (e) {}
let elem = config.mainWidget || window.content;
if (this.has("tabs"))
{
let frame = tabs.localStore.focusedFrame;
if (frame && frame.top == window.content)
elem = frame;
}
if (clearFocusedElement && document.commandDispatcher.focusedElement) if (clearFocusedElement && document.commandDispatcher.focusedElement)
document.commandDispatcher.focusedElement.blur(); document.commandDispatcher.focusedElement.blur();
if (elem && (elem != document.commandDispatcher.focusedElement)) if (elem && (elem != document.commandDispatcher.focusedElement))