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

Slight change to commandline.commandOutput.

Browse Source 
--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
Download Patch File Download Diff File Expand all files Collapse all files

5
common/content/commandline.js
View File

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

5
common/content/events.js
View File

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