From e9206487011308dcec4f3f3ff66f10e5e8ebcd42 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Sat, 1 Jan 2011 03:48:38 +1100 Subject: [PATCH] Update mapping definitions for Melodactyl and Teledactyl to use Args object. --- melodactyl/content/player.js | 14 ++++---- teledactyl/content/mail.js | 66 +++++++++++++++++------------------- 2 files changed, 39 insertions(+), 41 deletions(-) diff --git a/melodactyl/content/player.js b/melodactyl/content/player.js index 1f1605e6..89f7c2ee 100644 --- a/melodactyl/content/player.js +++ b/melodactyl/content/player.js @@ -688,7 +688,7 @@ const Player = Module("player", { mappings.add([modes.PLAYER], ["z"], "Previous track", - function (count) { ex.playerprev({ "#": count }); }, + function (args) { ex.playerprev({ "#": args.count }); }, { count: true }); mappings.add([modes.PLAYER], @@ -697,7 +697,7 @@ const Player = Module("player", { mappings.add([modes.PLAYER], ["b"], "Next track", - function (count) { ex.playernext({ "#": count }); }, + function (args) { ex.playernext({ "#": args.count }); }, { count: true }); mappings.add([modes.PLAYER], @@ -726,22 +726,22 @@ const Player = Module("player", { mappings.add([modes.PLAYER], ["h", ""], "Seek -10s", - function (count) { player.seekBackward(Math.max(1, count) * 10000); }, + function (args) { player.seekBackward(Math.max(1, args.count) * 10000); }, { count: true }); mappings.add([modes.PLAYER], ["l", ""], "Seek +10s", - function (count) { player.seekForward(Math.max(1, count) * 10000); }, + function (args) { player.seekForward(Math.max(1, args.count) * 10000); }, { count: true }); mappings.add([modes.PLAYER], ["H", ""], "Seek -1m", - function (count) { player.seekBackward(Math.max(1, count) * 60000); }, + function (args) { player.seekBackward(Math.max(1, args.count) * 60000); }, { count: true }); mappings.add([modes.PLAYER], ["L", ""], "Seek +1m", - function (count) { player.seekForward(Math.max(1, count) * 60000); }, + function (args) { player.seekForward(Math.max(1, args.count) * 60000); }, { count: true }); mappings.add([modes.PLAYER], @@ -754,7 +754,7 @@ const Player = Module("player", { mappings.add([modes.PLAYER], ["/"], "Search forward for a track", - function (args) { commandline.open("/", "", modes.SEARCH_VIEW_FORWARD); }); + function () { commandline.open("/", "", modes.SEARCH_VIEW_FORWARD); }); mappings.add([modes.PLAYER], ["n"], "Find the next track", diff --git a/teledactyl/content/mail.js b/teledactyl/content/mail.js index fa81dfa5..c6273b78 100644 --- a/teledactyl/content/mail.js +++ b/teledactyl/content/mail.js @@ -527,40 +527,40 @@ const Mail = Module("mail", { mappings.add(myModes, ["j", ""], "Select next message", - function (count) { mail.selectMessage(function (msg) true, false, false, false, count); }, + function (args) { mail.selectMessage(function (msg) true, false, false, false, args.count); }, { count: true }); mappings.add(myModes, ["gj"], "Select next message, including closed threads", - function (count) { mail.selectMessage(function (msg) true, false, true, false, count); }, + function (args) { mail.selectMessage(function (msg) true, false, true, false, args.count); }, { count: true }); mappings.add(myModes, ["J", ""], "Select next unread message", - function (count) { mail.selectMessage(function (msg) !msg.isRead, true, true, false, count); }, + function (args) { mail.selectMessage(function (msg) !msg.isRead, true, true, false, args.count); }, { count: true }); mappings.add(myModes, ["k", ""], "Select previous message", - function (count) { mail.selectMessage(function (msg) true, false, false, true, count); }, + function (args) { mail.selectMessage(function (msg) true, false, false, true, args.count); }, { count: true }); mappings.add(myModes, ["gk"], "Select previous message", - function (count) { mail.selectMessage(function (msg) true, false, true, true, count); }, + function (args) { mail.selectMessage(function (msg) true, false, true, true, args.count); }, { count: true }); mappings.add(myModes, ["K"], "Select previous unread message", - function (count) { mail.selectMessage(function (msg) !msg.isRead, true, true, true, count); }, + function (args) { mail.selectMessage(function (msg) !msg.isRead, true, true, true, args.count); }, { count: true }); mappings.add(myModes, ["*"], "Select next message from the same sender", - function (count) { + function (args) { try { let author = gDBView.hdrForFirstSelectedMessage.mime2DecodedAuthor.toLowerCase(); - mail.selectMessage(function (msg) msg.mime2DecodedAuthor.toLowerCase().indexOf(author) == 0, true, true, false, count); + mail.selectMessage(function (msg) msg.mime2DecodedAuthor.toLowerCase().indexOf(author) == 0, true, true, false, args.count); } catch (e) { dactyl.beep(); } }, @@ -568,10 +568,10 @@ const Mail = Module("mail", { mappings.add(myModes, ["#"], "Select previous message from the same sender", - function (count) { + function (args) { try { let author = gDBView.hdrForFirstSelectedMessage.mime2DecodedAuthor.toLowerCase(); - mail.selectMessage(function (msg) msg.mime2DecodedAuthor.toLowerCase().indexOf(author) == 0, true, true, true, count); + mail.selectMessage(function (msg) msg.mime2DecodedAuthor.toLowerCase().indexOf(author) == 0, true, true, true, args.count); } catch (e) { dactyl.beep(); } }, @@ -613,22 +613,22 @@ const Mail = Module("mail", { // SCROLLING mappings.add(myModes, [""], "Scroll message down", - function (count) { buffer.scrollLines(Math.max(count, 1)); }, + function (args) { buffer.scrollLines(Math.max(args.count, 1)); }, { count: true }); mappings.add(myModes, [""], "Scroll message up", - function (count) { buffer.scrollLines(-Math.max(count, 1)); }, + function (args) { buffer.scrollLines(-Math.max(args.count, 1)); }, { count: true }); mappings.add([modes.MESSAGE], [""], "Select previous message", - function (count) { mail.selectMessage(function (msg) true, false, false, true, count); }, + function (args) { mail.selectMessage(function (msg) true, false, false, true, args.count); }, { count: true }); mappings.add([modes.MESSAGE], [""], "Select next message", - function (count) { mail.selectMessage(function (msg) true, false, false, false, count); }, + function (args) { mail.selectMessage(function (msg) true, false, false, false, args.count); }, { count: true }); // UNDO/REDO @@ -677,29 +677,29 @@ const Mail = Module("mail", { mappings.add(myModes, ["]s"], "Select next starred message", - function (count) { mail.selectMessage(function (msg) msg.isFlagged, true, true, false, count); }, + function (args) { mail.selectMessage(function (msg) msg.isFlagged, true, true, false, args.count); }, { count: true }); mappings.add(myModes, ["[s"], "Select previous starred message", - function (count) { mail.selectMessage(function (msg) msg.isFlagged, true, true, true, count); }, + function (args) { mail.selectMessage(function (msg) msg.isFlagged, true, true, true, args.count); }, { count: true }); mappings.add(myModes, ["]a"], "Select next message with an attachment", - function (count) { mail.selectMessage(function (msg) gDBView.db.HasAttachments(msg.messageKey), true, true, false, count); }, + function (args) { mail.selectMessage(function (msg) gDBView.db.HasAttachments(msg.messageKey), true, true, false, args.count); }, { count: true }); mappings.add(myModes, ["[a"], "Select previous message with an attachment", - function (count) { mail.selectMessage(function (msg) gDBView.db.HasAttachments(msg.messageKey), true, true, true, count); }, + function (args) { mail.selectMessage(function (msg) gDBView.db.HasAttachments(msg.messageKey), true, true, true, args.count); }, { count: true }); // FOLDER SWITCHING mappings.add(myModes, ["gi"], "Go to inbox", - function (count) { - let folder = mail.getFolders("Inbox", false, true)[(count > 0) ? (count - 1) : 0]; + function (args) { + let folder = mail.getFolders("Inbox", false, true)[(args.count > 0) ? (args.count - 1) : 0]; if (folder) SelectFolder(folder.URI); else @@ -709,9 +709,8 @@ const Mail = Module("mail", { mappings.add(myModes, [""], "Select next folder", - function (count) { - count = Math.max(1, count); - let newPos = this._getCurrentFolderIndex() + count; + function (args) { + let newPos = this._getCurrentFolderIndex() + Math.max(1, args.count); if (newPos >= gFolderTreeView.rowCount) { newPos = newPos % gFolderTreeView.rowCount; commandline.echo("search hit BOTTOM, continuing at TOP", commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES); @@ -722,16 +721,15 @@ const Mail = Module("mail", { mappings.add(myModes, [""], "Go to next mailbox with unread messages", - function (count) { - this._selectUnreadFolder(false, count); + function (args) { + this._selectUnreadFolder(false, args.count); }, { count: true }); mappings.add(myModes, [""], "Select previous folder", - function (count) { - count = Math.max(1, count); - let newPos = this._getCurrentFolderIndex() - count; + function (args) { + let newPos = this._getCurrentFolderIndex() - Math.max(1, args.count); if (newPos < 0) { newPos = (newPos % gFolderTreeView.rowCount) + gFolderTreeView.rowCount; commandline.echo("search hit TOP, continuing at BOTTOM", commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES); @@ -742,8 +740,8 @@ const Mail = Module("mail", { mappings.add(myModes, [""], "Go to previous mailbox with unread messages", - function (count) { - this._selectUnreadFolder(true, count); + function (args) { + this._selectUnreadFolder(true, args.count); }, { count: true }); @@ -770,22 +768,22 @@ const Mail = Module("mail", { mappings.add(myModes, [""], "Go forward", - function (count) { if (count < 1) count = 1; while (count--) GoNextMessage(nsMsgNavigationType.forward, true); }, + function ({ count }) { if (count < 1) count = 1; while (count--) GoNextMessage(nsMsgNavigationType.forward, true); }, { count: true }); mappings.add(myModes, [""], "Go back", - function (count) { if (count < 1) count = 1; while (count--) GoNextMessage(nsMsgNavigationType.back, true); }, + function ({ count }) { if (count < 1) count = 1; while (count--) GoNextMessage(nsMsgNavigationType.back, true); }, { count: true }); mappings.add(myModes, ["gg"], "Select first message", - function (count) { if (count < 1) count = 1; while (count--) GoNextMessage(nsMsgNavigationType.firstMessage, true); }, + function ({ count }) { if (count < 1) count = 1; while (count--) GoNextMessage(nsMsgNavigationType.firstMessage, true); }, { count: true }); mappings.add(myModes, ["G"], "Select last message", - function (count) { if (count < 1) count = 1; while (count--) GoNextMessage(nsMsgNavigationType.lastMessage, false); }, + function ({ count }) { if (count < 1) count = 1; while (count--) GoNextMessage(nsMsgNavigationType.lastMessage, false); }, { count: true }); // tagging messages