From e0a0388382c1cb6c2cdcb2b5a1dea56150548bb5 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Sat, 24 Aug 2013 21:54:28 +1000 Subject: [PATCH] Utilise object destructuring in parameter lists of stray map definitions. --- common/content/editor.js | 8 +-- common/modules/buffer.jsm | 98 ++++++++++++++++++------------------ common/modules/commands.jsm | 4 +- melodactyl/content/player.js | 12 ++--- teledactyl/content/mail.js | 58 ++++++++++----------- 5 files changed, 90 insertions(+), 90 deletions(-) diff --git a/common/content/editor.js b/common/content/editor.js index 730a19af..89914d27 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -1158,15 +1158,15 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), { // text edit mode bind(["u"], "Undo changes", - function (args) { - editor.editor.undo(Math.max(args.count, 1)); + function ({ count }) { + editor.editor.undo(Math.max(count, 1)); editor.deselect(); }, { count: true, noTransaction: true }); bind([""], "Redo undone changes", - function (args) { - editor.editor.redo(Math.max(args.count, 1)); + function ({ count }) { + editor.editor.redo(Math.max(count, 1)); editor.deselect(); }, { count: true, noTransaction: true }); diff --git a/common/modules/buffer.jsm b/common/modules/buffer.jsm index 534dee73..15aea79b 100644 --- a/common/modules/buffer.jsm +++ b/common/modules/buffer.jsm @@ -2012,17 +2012,17 @@ var Buffer = Module("Buffer", { mappings.add([modes.NORMAL], ["", ""], "Increment last number in URL", - function (args) { buffer.incrementURL(Math.max(args.count, 1)); }, + function ({ count }) { buffer.incrementURL(Math.max(count, 1)); }, { count: true }); mappings.add([modes.NORMAL], ["", ""], "Decrement last number in URL", - function (args) { buffer.incrementURL(-Math.max(args.count, 1)); }, + function ({ count }) { buffer.incrementURL(-Math.max(count, 1)); }, { count: true }); mappings.add([modes.NORMAL], ["gu", ""], "Go to parent directory", - function (args) { buffer.climbUrlPath(Math.max(args.count, 1)); }, + function ({ count }) { buffer.climbUrlPath(Math.max(count, 1)); }, { count: true }); mappings.add([modes.NORMAL], ["gU", ""], @@ -2031,9 +2031,9 @@ var Buffer = Module("Buffer", { mappings.add([modes.COMMAND], [".", ""], "Repeat the last key event", - function (args) { + function ({ count }) { if (mappings.repeat) { - for (let i in util.interruptibleRange(0, Math.max(args.count, 1), 100)) + for (let i in util.interruptibleRange(0, Math.max(count, 1), 100)) mappings.repeat(); } }, @@ -2050,22 +2050,22 @@ var Buffer = Module("Buffer", { // scrolling mappings.add([modes.NORMAL], ["j", "", "", ""], "Scroll document down", - function (args) { buffer.scrollVertical("lines", Math.max(args.count, 1)); }, + function ({ count }) { buffer.scrollVertical("lines", Math.max(count, 1)); }, { count: true }); mappings.add([modes.NORMAL], ["k", "", "", ""], "Scroll document up", - function (args) { buffer.scrollVertical("lines", -Math.max(args.count, 1)); }, + function ({ count }) { buffer.scrollVertical("lines", -Math.max(count, 1)); }, { count: true }); mappings.add([modes.NORMAL], dactyl.has("mail") ? ["h", ""] : ["h", "", ""], "Scroll document to the left", - function (args) { buffer.scrollHorizontal("columns", -Math.max(args.count, 1)); }, + function ({ count }) { buffer.scrollHorizontal("columns", -Math.max(count, 1)); }, { count: true }); mappings.add([modes.NORMAL], dactyl.has("mail") ? ["l", ""] : ["l", "", ""], "Scroll document to the right", - function (args) { buffer.scrollHorizontal("columns", Math.max(args.count, 1)); }, + function ({ count }) { buffer.scrollHorizontal("columns", Math.max(count, 1)); }, { count: true }); mappings.add([modes.NORMAL], ["0", "^", ""], @@ -2078,21 +2078,21 @@ var Buffer = Module("Buffer", { mappings.add([modes.NORMAL], ["gg", "", ""], "Go to the top of the document", - function (args) { buffer.scrollToPercent(null, args.count != null ? args.count : 0, - args.count != null ? 0 : -1); }, + function ({ count }) { buffer.scrollToPercent(null, count != null ? count : 0, + count != null ? 0 : -1); }, { count: true }); mappings.add([modes.NORMAL], ["G", "", ""], "Go to the end of the document", - function (args) { - if (args.count) + function ({ count }) { + if (count) var elem = options.get("linenumbers") .getLine(buffer.focusedFrame.document, - args.count); + count); if (elem) elem.scrollIntoView(true); - else if (args.count) - buffer.scrollToPosition(null, args.count); + else if (count) + buffer.scrollToPosition(null, count); else buffer.scrollToPercent(null, 100, 1); }, @@ -2100,91 +2100,91 @@ var Buffer = Module("Buffer", { mappings.add([modes.NORMAL], ["%", ""], "Scroll to {count} percent of the document", - function (args) { - dactyl.assert(args.count > 0 && args.count <= 100); - buffer.scrollToPercent(null, args.count); + function ({ count }) { + dactyl.assert(count > 0 && count <= 100); + buffer.scrollToPercent(null, count); }, { count: true }); mappings.add([modes.NORMAL], ["", ""], "Scroll window downwards in the buffer", - function (args) { buffer._scrollByScrollSize(args.count, true); }, + function ({ count }) { buffer._scrollByScrollSize(count, true); }, { count: true }); mappings.add([modes.NORMAL], ["", ""], "Scroll window upwards in the buffer", - function (args) { buffer._scrollByScrollSize(args.count, false); }, + function ({ count }) { buffer._scrollByScrollSize(count, false); }, { count: true }); mappings.add([modes.NORMAL], ["", "", "", ""], "Scroll up a full page", - function (args) { buffer.scrollVertical("pages", -Math.max(args.count, 1)); }, + function ({ count }) { buffer.scrollVertical("pages", -Math.max(count, 1)); }, { count: true }); mappings.add([modes.NORMAL], [""], "Scroll down a full page", - function (args) { + function ({ count }) { if (isinstance((services.focus.focusedWindow || buffer.win).document.activeElement, [Ci.nsIDOMHTMLInputElement, Ci.nsIDOMHTMLButtonElement, Ci.nsIDOMXULButtonElement])) return Events.PASS; - buffer.scrollVertical("pages", Math.max(args.count, 1)); + buffer.scrollVertical("pages", Math.max(count, 1)); }, { count: true }); mappings.add([modes.NORMAL], ["", "", ""], "Scroll down a full page", - function (args) { buffer.scrollVertical("pages", Math.max(args.count, 1)); }, + function ({ count }) { buffer.scrollVertical("pages", Math.max(count, 1)); }, { count: true }); mappings.add([modes.NORMAL], ["]f", ""], "Focus next frame", - function (args) { buffer.shiftFrameFocus(Math.max(args.count, 1)); }, + function ({ count }) { buffer.shiftFrameFocus(Math.max(count, 1)); }, { count: true }); mappings.add([modes.NORMAL], ["[f", ""], "Focus previous frame", - function (args) { buffer.shiftFrameFocus(-Math.max(args.count, 1)); }, + function ({ count }) { buffer.shiftFrameFocus(-Math.max(count, 1)); }, { count: true }); mappings.add([modes.NORMAL], ["["], "Jump to the previous element as defined by 'jumptags'", - function (args) { buffer.findJump(args.arg, args.count, true); }, + function ({ arg, count }) { buffer.findJump(arg, count, true); }, { arg: true, count: true }); mappings.add([modes.NORMAL], ["g]"], "Jump to the next off-screen element as defined by 'jumptags'", - function (args) { buffer.findJump(args.arg, args.count, false, true); }, + function ({ arg, count }) { buffer.findJump(arg, count, false, true); }, { arg: true, count: true }); mappings.add([modes.NORMAL], ["]"], "Jump to the next element as defined by 'jumptags'", - function (args) { buffer.findJump(args.arg, args.count, false); }, + function ({ arg, count }) { buffer.findJump(arg, count, false); }, { arg: true, count: true }); mappings.add([modes.NORMAL], ["{"], "Jump to the previous paragraph", - function (args) { buffer.findJump("p", args.count, true); }, + function ({ count }) { buffer.findJump("p", count, true); }, { count: true }); mappings.add([modes.NORMAL], ["}"], "Jump to the next paragraph", - function (args) { buffer.findJump("p", args.count, false); }, + function ({ count }) { buffer.findJump("p", count, false); }, { count: true }); mappings.add([modes.NORMAL], ["]]", ""], "Follow the link labeled 'next' or '>' if it exists", - function (args) { - buffer.findLink("next", options["nextpattern"], (args.count || 1) - 1, true); + function ({ count }) { + buffer.findLink("next", options["nextpattern"], (count || 1) - 1, true); }, { count: true }); mappings.add([modes.NORMAL], ["[[", ""], "Follow the link labeled 'prev', 'previous' or '<' if it exists", - function (args) { - buffer.findLink("prev", options["previouspattern"], (args.count || 1) - 1, true); + function ({ count }) { + buffer.findLink("prev", options["previouspattern"], (count || 1) - 1, true); }, { count: true }); @@ -2198,10 +2198,10 @@ var Buffer = Module("Buffer", { mappings.add([modes.NORMAL], ["gi", ""], "Focus last used input field", - function (args) { + function ({ count }) { let elem = buffer.lastInputField; - if (args.count >= 1 || !elem || !events.isContentNode(elem)) { + if (count >= 1 || !elem || !events.isContentNode(elem)) { let xpath = ["frame", "iframe", "input", "xul:textbox", "textarea[not(@disabled) and not(@readonly)]"]; let frames = buffer.allFrames(null, true); @@ -2225,7 +2225,7 @@ var Buffer = Module("Buffer", { }); dactyl.assert(elements.length > 0); - elem = elements[Math.constrain(args.count, 1, elements.length) - 1]; + elem = elements[Math.constrain(count, 1, elements.length) - 1]; } buffer.focusElement(elem); DOM(elem).scrollIntoView(); @@ -2281,52 +2281,52 @@ var Buffer = Module("Buffer", { // zooming mappings.add([modes.NORMAL], ["zi", "+", ""], "Enlarge text zoom of current web page", - function (args) { buffer.zoomIn(Math.max(args.count, 1), false); }, + function ({ count }) { buffer.zoomIn(Math.max(count, 1), false); }, { count: true }); mappings.add([modes.NORMAL], ["zm", ""], "Enlarge text zoom of current web page by a larger amount", - function (args) { buffer.zoomIn(Math.max(args.count, 1) * 3, false); }, + function ({ count }) { buffer.zoomIn(Math.max(count, 1) * 3, false); }, { count: true }); mappings.add([modes.NORMAL], ["zo", "-", ""], "Reduce text zoom of current web page", - function (args) { buffer.zoomOut(Math.max(args.count, 1), false); }, + function ({ count }) { buffer.zoomOut(Math.max(count, 1), false); }, { count: true }); mappings.add([modes.NORMAL], ["zr", ""], "Reduce text zoom of current web page by a larger amount", - function (args) { buffer.zoomOut(Math.max(args.count, 1) * 3, false); }, + function ({ count }) { buffer.zoomOut(Math.max(count, 1) * 3, false); }, { count: true }); mappings.add([modes.NORMAL], ["zz", ""], "Set text zoom value of current web page", - function (args) { buffer.setZoom(args.count > 1 ? args.count : 100, false); }, + function ({ count }) { buffer.setZoom(count > 1 ? count : 100, false); }, { count: true }); mappings.add([modes.NORMAL], ["ZI", "zI", ""], "Enlarge full zoom of current web page", - function (args) { buffer.zoomIn(Math.max(args.count, 1), true); }, + function ({ count }) { buffer.zoomIn(Math.max(count, 1), true); }, { count: true }); mappings.add([modes.NORMAL], ["ZM", "zM", ""], "Enlarge full zoom of current web page by a larger amount", - function (args) { buffer.zoomIn(Math.max(args.count, 1) * 3, true); }, + function ({ count }) { buffer.zoomIn(Math.max(count, 1) * 3, true); }, { count: true }); mappings.add([modes.NORMAL], ["ZO", "zO", ""], "Reduce full zoom of current web page", - function (args) { buffer.zoomOut(Math.max(args.count, 1), true); }, + function ({ count }) { buffer.zoomOut(Math.max(count, 1), true); }, { count: true }); mappings.add([modes.NORMAL], ["ZR", "zR", ""], "Reduce full zoom of current web page by a larger amount", - function (args) { buffer.zoomOut(Math.max(args.count, 1) * 3, true); }, + function ({ count }) { buffer.zoomOut(Math.max(count, 1) * 3, true); }, { count: true }); mappings.add([modes.NORMAL], ["zZ", ""], "Set full zoom value of current web page", - function (args) { buffer.setZoom(args.count > 1 ? args.count : 100, true); }, + function ({ count }) { buffer.setZoom(count > 1 ? count : 100, true); }, { count: true }); // page info diff --git a/common/modules/commands.jsm b/common/modules/commands.jsm index 92a5b47b..f083ff7c 100644 --- a/common/modules/commands.jsm +++ b/common/modules/commands.jsm @@ -1764,9 +1764,9 @@ var Commands = Module("commands", { mappings.add([modes.COMMAND], ["@:"], "Repeat the last Ex command", - function (args) { + function ({ count }) { if (commands.repeat) { - for (let i in util.interruptibleRange(0, Math.max(args.count, 1), 100)) + for (let i in util.interruptibleRange(0, Math.max(count, 1), 100)) dactyl.execute(commands.repeat); } else diff --git a/melodactyl/content/player.js b/melodactyl/content/player.js index eb4143bd..96e97a04 100644 --- a/melodactyl/content/player.js +++ b/melodactyl/content/player.js @@ -715,7 +715,7 @@ const Player = Module("player", { mappings.add([modes.PLAYER], ["z"], "Previous track", - function (args) { ex.playerprev({ "#": args.count }); }, + function ({ count }) { ex.playerprev({ "#": count }); }, { count: true }); mappings.add([modes.PLAYER], @@ -724,7 +724,7 @@ const Player = Module("player", { mappings.add([modes.PLAYER], ["b"], "Next track", - function (args) { ex.playernext({ "#": args.count }); }, + function ({ count }) { ex.playernext({ "#": count }); }, { count: true }); mappings.add([modes.PLAYER], @@ -753,22 +753,22 @@ const Player = Module("player", { mappings.add([modes.PLAYER], ["h", ""], "Seek -10s", - function (args) { player.seekBackward(Math.max(1, args.count) * 10000); }, + function ({ count} ) { player.seekBackward(Math.max(1, count) * 10000); }, { count: true }); mappings.add([modes.PLAYER], ["l", ""], "Seek +10s", - function (args) { player.seekForward(Math.max(1, args.count) * 10000); }, + function ({ count} ) { player.seekForward(Math.max(1, count) * 10000); }, { count: true }); mappings.add([modes.PLAYER], ["H", ""], "Seek -1m", - function (args) { player.seekBackward(Math.max(1, args.count) * 60000); }, + function ({ count }) { player.seekBackward(Math.max(1, count) * 60000); }, { count: true }); mappings.add([modes.PLAYER], ["L", ""], "Seek +1m", - function (args) { player.seekForward(Math.max(1, args.count) * 60000); }, + function ({ count }) { player.seekForward(Math.max(1, count) * 60000); }, { count: true }); mappings.add([modes.PLAYER], diff --git a/teledactyl/content/mail.js b/teledactyl/content/mail.js index 5db4c6b1..9c4502dd 100644 --- a/teledactyl/content/mail.js +++ b/teledactyl/content/mail.js @@ -518,47 +518,47 @@ var Mail = Module("mail", { mappings.add(myModes, ["j", ""], "Select next message", - function (args) { mail.selectMessage(function (msg) true, false, false, false, args.count); }, + function ({ count }) { mail.selectMessage(function (msg) true, false, false, false, count); }, { count: true }); mappings.add(myModes, ["gj"], "Select next message, including closed threads", - function (args) { mail.selectMessage(function (msg) true, false, true, false, args.count); }, + function ({ count }) { mail.selectMessage(function (msg) true, false, true, false, count); }, { count: true }); mappings.add(myModes, ["J", ""], "Select next unread message", - function (args) { mail.selectMessage(function (msg) !msg.isRead, true, true, false, args.count); }, + function ({ count }) { mail.selectMessage(function (msg) !msg.isRead, true, true, false, count); }, { count: true }); mappings.add(myModes, ["k", ""], "Select previous message", - function (args) { mail.selectMessage(function (msg) true, false, false, true, args.count); }, + function ({ count }) { mail.selectMessage(function (msg) true, false, false, true, count); }, { count: true }); mappings.add(myModes, ["gk"], "Select previous message", - function (args) { mail.selectMessage(function (msg) true, false, true, true, args.count); }, + function ({ count }) { mail.selectMessage(function (msg) true, false, true, true, count); }, { count: true }); mappings.add(myModes, ["K"], "Select previous unread message", - function (args) { mail.selectMessage(function (msg) !msg.isRead, true, true, true, args.count); }, + function ({ count }) { mail.selectMessage(function (msg) !msg.isRead, true, true, true, count); }, { count: true }); mappings.add(myModes, ["*"], "Select next message from the same sender", - function (args) { + function ({ count }) { let author = gDBView.hdrForFirstSelectedMessage.mime2DecodedAuthor.toLowerCase(); - mail.selectMessage(function (msg) msg.mime2DecodedAuthor.toLowerCase().indexOf(author) == 0, true, true, false, args.count); + mail.selectMessage(function (msg) msg.mime2DecodedAuthor.toLowerCase().indexOf(author) == 0, true, true, false, count); }, { count: true }); mappings.add(myModes, ["#"], "Select previous message from the same sender", - function (args) { + function ({ count }) { let author = gDBView.hdrForFirstSelectedMessage.mime2DecodedAuthor.toLowerCase(); - mail.selectMessage(function (msg) msg.mime2DecodedAuthor.toLowerCase().indexOf(author) == 0, true, true, true, args.count); + mail.selectMessage(function (msg) msg.mime2DecodedAuthor.toLowerCase().indexOf(author) == 0, true, true, true, count); }, { count: true }); @@ -593,22 +593,22 @@ var Mail = Module("mail", { // SCROLLING mappings.add(myModes, [""], "Scroll message down", - function (args) { buffer.scrollLines(Math.max(args.count, 1)); }, + function ({ count }) { buffer.scrollLines(Math.max(count, 1)); }, { count: true }); mappings.add(myModes, [""], "Scroll message up", - function (args) { buffer.scrollLines(-Math.max(args.count, 1)); }, + function ({ count }) { buffer.scrollLines(-Math.max(count, 1)); }, { count: true }); mappings.add([modes.MESSAGE], [""], "Select previous message", - function (args) { mail.selectMessage(function (msg) true, false, false, true, args.count); }, + function ({ count }) { mail.selectMessage(function (msg) true, false, false, true, count); }, { count: true }); mappings.add([modes.MESSAGE], [""], "Select next message", - function (args) { mail.selectMessage(function (msg) true, false, false, false, args.count); }, + function ({ count }) { mail.selectMessage(function (msg) true, false, false, false, count); }, { count: true }); // UNDO/REDO @@ -657,29 +657,29 @@ var Mail = Module("mail", { mappings.add(myModes, ["]s"], "Select next starred message", - function (args) { mail.selectMessage(function (msg) msg.isFlagged, true, true, false, args.count); }, + function ({ count }) { mail.selectMessage(function (msg) msg.isFlagged, true, true, false, count); }, { count: true }); mappings.add(myModes, ["[s"], "Select previous starred message", - function (args) { mail.selectMessage(function (msg) msg.isFlagged, true, true, true, args.count); }, + function ({ count }) { mail.selectMessage(function (msg) msg.isFlagged, true, true, true, count); }, { count: true }); mappings.add(myModes, ["]a"], "Select next message with an attachment", - function (args) { mail.selectMessage(function (msg) gDBView.db.HasAttachments(msg.messageKey), true, true, false, args.count); }, + function ({ count }) { mail.selectMessage(function (msg) gDBView.db.HasAttachments(msg.messageKey), true, true, false, count); }, { count: true }); mappings.add(myModes, ["[a"], "Select previous message with an attachment", - function (args) { mail.selectMessage(function (msg) gDBView.db.HasAttachments(msg.messageKey), true, true, true, args.count); }, + function ({ count }) { mail.selectMessage(function (msg) gDBView.db.HasAttachments(msg.messageKey), true, true, true, count); }, { count: true }); // FOLDER SWITCHING mappings.add(myModes, ["gi"], "Go to inbox", - function (args) { - let folder = mail.getFolders("Inbox", false, true)[(args.count > 0) ? (args.count - 1) : 0]; + function ({ count }) { + let folder = mail.getFolders("Inbox", false, true)[(count > 0) ? (count - 1) : 0]; if (folder) SelectFolder(folder.URI); else @@ -689,8 +689,8 @@ var Mail = Module("mail", { mappings.add(myModes, [""], "Select next folder", - function (args) { - let newPos = mail._getCurrentFolderIndex() + Math.max(1, args.count); + function ({ count }) { + let newPos = mail._getCurrentFolderIndex() + Math.max(1, count); if (newPos >= gFolderTreeView.rowCount) { newPos = newPos % gFolderTreeView.rowCount; commandline.echo(_("finder.atBottom"), commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES); @@ -701,15 +701,15 @@ var Mail = Module("mail", { mappings.add(myModes, [""], "Go to next mailbox with unread messages", - function (args) { - mail._selectUnreadFolder(false, args.count); + function ({ count }) { + mail._selectUnreadFolder(false, count); }, { count: true }); mappings.add(myModes, [""], "Select previous folder", - function (args) { - let newPos = mail._getCurrentFolderIndex() - Math.max(1, args.count); + function ({ count }) { + let newPos = mail._getCurrentFolderIndex() - Math.max(1, count); if (newPos < 0) { newPos = (newPos % gFolderTreeView.rowCount) + gFolderTreeView.rowCount; commandline.echo(_("finder.atTop"), commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES); @@ -720,8 +720,8 @@ var Mail = Module("mail", { mappings.add(myModes, [""], "Go to previous mailbox with unread messages", - function (args) { - mail._selectUnreadFolder(true, args.count); + function ({ count }) { + mail._selectUnreadFolder(true, count); }, { count: true }); @@ -769,7 +769,7 @@ var Mail = Module("mail", { // tagging messages mappings.add(myModes, ["l"], "Label message", - function (arg) { + function ({ arg }) { if (!GetSelectedMessages()) return void dactyl.beep();