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

Slight change to commandline.commandOutput.

--HG--
extra : rebase_source : 486ddf89143c0b558e3801c56306b0557ec144d8
This commit is contained in:
Kris Maglione
2011-03-17 00:46:13 -04:00
parent 7b624705f7
commit bb60d8aeba
2 changed files with 6 additions and 4 deletions

View File

@@ -651,8 +651,9 @@ var CommandLine = Module("commandline", {
XML.ignoreWhitespace = false;
XML.prettyPrinting = false;
if (this.command)
this.echo(<>:{this.command}</>, this.HIGHLIGHT_NORMAL, this.FORCE_MULTILINE);
this.echo(xml, this.HIGHLIGHT_NORMAL, this.FORCE_MULTILINE);
this.echo(<>:{this.command}{xml}</>, this.HIGHLIGHT_NORMAL, this.FORCE_MULTILINE);
else
this.echo(xml, this.HIGHLIGHT_NORMAL, this.FORCE_MULTILINE);
this.command = null;
},

View File

@@ -62,6 +62,7 @@ var ProcessorStack = Class("ProcessorStack", {
callable(result) ? result.toSource().substr(0, 50) : result),
execute: function execute(result, force) {
events.dbg("EXECUTE " + this._result(result) + " " + force + " " + this.events.length + " " + this.processors.length);
let processors = this.processors;
let length = 1;
@@ -1600,7 +1601,7 @@ var Events = Module("events", {
},
{ arg: true, count: true });
mappings.add([modes.MAIN],
mappings.add([modes.COMMAND],
["<A-m>s", "<sleep>"], "Sleep for {count} milliseconds before continuing macro playback",
function ({ command, count }) {
let now = Date.now();
@@ -1610,7 +1611,7 @@ var Events = Module("events", {
},
{ count: true });
mappings.add([modes.MAIN],
mappings.add([modes.COMMAND],
["<A-m>l", "<wait-for-page-load>"], "Wait for the current page to finish loading before continuing macro playback",
function ({ count }) {
if (events.feedingKeys && !events.waitForPageLoad(count)) {