diff --git a/common/content/browser.js b/common/content/browser.js index b5c4e1f5..e5e710bb 100644 --- a/common/content/browser.js +++ b/common/content/browser.js @@ -156,7 +156,7 @@ const Browser = Module("browser", { mappings.add([modes.NORMAL], [""], "Redraw the screen", - function () { commands.get("redraw").execute("", false); }); + function () { dactyl.execute("redraw"); }); }, commands: function () { @@ -186,9 +186,8 @@ const Browser = Module("browser", { commands.add(["redr[aw]"], "Redraw the screen", function () { - let wu = window.QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIDOMWindowUtils); - wu.redraw(); + window.QueryInterface(Ci.nsIInterfaceRequestor) + .getInterface(Ci.nsIDOMWindowUtils).redraw(); modes.show(); }, { argCount: "0" }); diff --git a/common/content/commands.js b/common/content/commands.js index 11c3a5aa..ede51c1f 100644 --- a/common/content/commands.js +++ b/common/content/commands.js @@ -127,14 +127,7 @@ const Command = Class("Command", { /** * Execute this command. * - * @param {string} args The args to be parsed and passed to - * {@link #action}. - * @param {boolean} bang Whether this command was executed with a trailing - * bang. - * @deprecated - * @param {number} count Whether this command was executed with a leading - * count. - * @deprecated + * @param {Args} args The Args object passed to {@link #action}. * @param {Object} modifiers Any modifiers to be passed to {@link #action}. */ execute: function (args, modifiers) { diff --git a/common/content/io.js b/common/content/io.js index 3b2ba161..f01b459f 100644 --- a/common/content/io.js +++ b/common/content/io.js @@ -375,8 +375,6 @@ lookup: dactyl.assert(false, "Unexpected end of file waiting for " + end); }; - function execute(args) { command.execute(args, special, count, { setFrom: file }); } - let iter = Iterator(lines); for (let [i, line] in iter) { if (this.sourcing.finished) diff --git a/common/content/tabs.js b/common/content/tabs.js index a03a18e5..76658eb0 100644 --- a/common/content/tabs.js +++ b/common/content/tabs.js @@ -968,7 +968,7 @@ const Tabs = Module("tabs", { if (dactyl.has("tabs_undo")) { mappings.add([modes.NORMAL], ["u"], "Undo closing of a tab", - function (count) { commands.get("undo").execute("", false, count); }, + function (count) { dactyl.execute(count + "undo"); }, { count: true }); }