diff --git a/4chan_x.user.js b/4chan_x.user.js index 8958ccb1a..ddc5850dc 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -698,25 +698,25 @@ node = _ref[_i]; node.removeAttribute('accesskey'); } - keybinds.close = (key = $.getValue('key/close', 0)).length ? key : 'Esc'; - keybinds.spoiler = (key = $.getValue('key/spoiler', 0)).length ? key : 'ctrl+s'; - keybinds.zero = (key = $.getValue('key/zero', 0)).length ? key : '0'; - keybinds.openQR = (key = $.getValue('key/openQR', 0)).length ? key : 'i'; - keybinds.openEmptyQR = (key = $.getValue('key/openEmptyQR', 0)).length ? key : 'I'; - keybinds.nextReply = (key = $.getValue('key/nextReply', 0)).length ? key : 'J'; - keybinds.previousReply = (key = $.getValue('key/previousReply', 0)).length ? key : 'K'; - keybinds.nextThread = (key = $.getValue('key/nextThread', 0)).length ? key : 'n'; - keybinds.previousThread = (key = $.getValue('key/previousThread', 0)).length ? key : 'p'; - keybinds.nextPage = (key = $.getValue('key/nextPage', 0)).length ? key : 'alt+x'; - keybinds.previousPage = (key = $.getValue('key/previousPage', 0)).length ? key : 'alt+z'; - keybinds.openThreadTab = (key = $.getValue('key/openThreadTab', 0)).length ? key : 'o'; - keybinds.openThread = (key = $.getValue('key/openThread', 0)).length ? key : 'O'; - keybinds.expandThread = (key = $.getValue('key/expandThread', 0)).length ? key : 'e'; - keybinds.watch = (key = $.getValue('key/watch', 0)).length ? key : 'w'; - keybinds.hide = (key = $.getValue('key/hide', 0)).length ? key : 'x'; - keybinds.expandImages = (key = $.getValue('key/expandImages', 0)).length ? key : 'm'; - keybinds.expandAllImages = (key = $.getValue('key/expandAllImages', 0)).length ? key : 'M'; - keybinds.update = (key = $.getValue('key/update', 0)).length ? key : 'u'; + keybinds.close = (key = $.getValue('key/close', 0)).length >= 0 ? key : 'Esc'; + keybinds.spoiler = (key = $.getValue('key/spoiler', 0)).length >= 0 ? key : 'ctrl+s'; + keybinds.openQR = (key = $.getValue('key/openQR', 0)).length >= 0 ? key : 'i'; + keybinds.openEmptyQR = (key = $.getValue('key/openEmptyQR', 0)).length >= 0 ? key : 'I'; + keybinds.nextReply = (key = $.getValue('key/nextReply', 0)).length >= 0 ? key : 'J'; + keybinds.previousReply = (key = $.getValue('key/previousReply', 0)).length >= 0 ? key : 'K'; + keybinds.nextThread = (key = $.getValue('key/nextThread', 0)).length >= 0 ? key : 'n'; + keybinds.previousThread = (key = $.getValue('key/previousThread', 0)).length >= 0 ? key : 'p'; + keybinds.nextPage = (key = $.getValue('key/nextPage', 0)).length >= 0 ? key : 'alt+x'; + keybinds.previousPage = (key = $.getValue('key/previousPage', 0)).length >= 0 ? key : 'alt+z'; + keybinds.zero = (key = $.getValue('key/zero', 0)).length >= 0 ? key : '0'; + keybinds.openThreadTab = (key = $.getValue('key/openThreadTab', 0)).length >= 0 ? key : 'o'; + keybinds.openThread = (key = $.getValue('key/openThread', 0)).length >= 0 ? key : 'O'; + keybinds.expandThread = (key = $.getValue('key/expandThread', 0)).length >= 0 ? key : 'e'; + keybinds.watch = (key = $.getValue('key/watch', 0)).length >= 0 ? key : 'w'; + keybinds.hide = (key = $.getValue('key/hide', 0)).length >= 0 ? key : 'x'; + keybinds.expandImages = (key = $.getValue('key/expandImages', 0)).length >= 0 ? key : 'm'; + keybinds.expandAllImages = (key = $.getValue('key/expandAllImages', 0)).length >= 0 ? key : 'M'; + keybinds.update = (key = $.getValue('key/update', 0)).length >= 0 ? key : 'u'; $.bind(d, 'keydown', keybinds.cb.keydown); return $.bind(d, 'keypress', keybinds.cb.keypress); }, @@ -1012,7 +1012,7 @@ var arr, checked, description, dialog, hiddenNum, hiddenThreads, html, input, key, li, link, main, obj, overlay, ul, _i, _j, _k, _len, _len2, _len3, _ref, _ref2, _ref3, _ref4; hiddenThreads = $.getValue("hiddenThreads/" + g.BOARD + "/", {}); hiddenNum = Object.keys(g.hiddenReplies).length + Object.keys(hiddenThreads).length; - html = "

"; + html = "

"; dialog = $.el('div', { id: 'options', innerHTML: html diff --git a/script.coffee b/script.coffee index 09db52955..a8fb24006 100644 --- a/script.coffee +++ b/script.coffee @@ -492,25 +492,25 @@ keybinds = for node in $$ '[accesskey]' node.removeAttribute 'accesskey' - keybinds.close = if (key = $.getValue 'key/close', 0).length then key else 'Esc' - keybinds.spoiler = if (key = $.getValue 'key/spoiler', 0).length then key else 'ctrl+s' - keybinds.zero = if (key = $.getValue 'key/zero', 0).length then key else '0' - keybinds.openQR = if (key = $.getValue 'key/openQR', 0).length then key else 'i' - keybinds.openEmptyQR = if (key = $.getValue 'key/openEmptyQR', 0).length then key else 'I' - keybinds.nextReply = if (key = $.getValue 'key/nextReply', 0).length then key else 'J' - keybinds.previousReply = if (key = $.getValue 'key/previousReply', 0).length then key else 'K' - keybinds.nextThread = if (key = $.getValue 'key/nextThread', 0).length then key else 'n' - keybinds.previousThread = if (key = $.getValue 'key/previousThread', 0).length then key else 'p' - keybinds.nextPage = if (key = $.getValue 'key/nextPage', 0).length then key else 'alt+x' - keybinds.previousPage = if (key = $.getValue 'key/previousPage', 0).length then key else 'alt+z' - keybinds.openThreadTab = if (key = $.getValue 'key/openThreadTab', 0).length then key else 'o' - keybinds.openThread = if (key = $.getValue 'key/openThread', 0).length then key else 'O' - keybinds.expandThread = if (key = $.getValue 'key/expandThread', 0).length then key else 'e' - keybinds.watch = if (key = $.getValue 'key/watch', 0).length then key else 'w' - keybinds.hide = if (key = $.getValue 'key/hide', 0).length then key else 'x' - keybinds.expandImages = if (key = $.getValue 'key/expandImages', 0).length then key else 'm' - keybinds.expandAllImages = if (key = $.getValue 'key/expandAllImages', 0).length then key else 'M' - keybinds.update = if (key = $.getValue 'key/update', 0).length then key else 'u' + keybinds.close = if (key = $.getValue 'key/close', 0).length >= 0 then key else 'Esc' + keybinds.spoiler = if (key = $.getValue 'key/spoiler', 0).length >= 0 then key else 'ctrl+s' + keybinds.openQR = if (key = $.getValue 'key/openQR', 0).length >= 0 then key else 'i' + keybinds.openEmptyQR = if (key = $.getValue 'key/openEmptyQR', 0).length >= 0 then key else 'I' + keybinds.nextReply = if (key = $.getValue 'key/nextReply', 0).length >= 0 then key else 'J' + keybinds.previousReply = if (key = $.getValue 'key/previousReply', 0).length >= 0 then key else 'K' + keybinds.nextThread = if (key = $.getValue 'key/nextThread', 0).length >= 0 then key else 'n' + keybinds.previousThread = if (key = $.getValue 'key/previousThread', 0).length >= 0 then key else 'p' + keybinds.nextPage = if (key = $.getValue 'key/nextPage', 0).length >= 0 then key else 'alt+x' + keybinds.previousPage = if (key = $.getValue 'key/previousPage', 0).length >= 0 then key else 'alt+z' + keybinds.zero = if (key = $.getValue 'key/zero', 0).length >= 0 then key else '0' + keybinds.openThreadTab = if (key = $.getValue 'key/openThreadTab', 0).length >= 0 then key else 'o' + keybinds.openThread = if (key = $.getValue 'key/openThread', 0).length >= 0 then key else 'O' + keybinds.expandThread = if (key = $.getValue 'key/expandThread', 0).length >= 0 then key else 'e' + keybinds.watch = if (key = $.getValue 'key/watch', 0).length >= 0 then key else 'w' + keybinds.hide = if (key = $.getValue 'key/hide', 0).length >= 0 then key else 'x' + keybinds.expandImages = if (key = $.getValue 'key/expandImages', 0).length >= 0 then key else 'm' + keybinds.expandAllImages = if (key = $.getValue 'key/expandAllImages', 0).length >= 0 then key else 'M' + keybinds.update = if (key = $.getValue 'key/update', 0).length >= 0 then key else 'u' $.bind d, 'keydown', keybinds.cb.keydown $.bind d, 'keypress', keybinds.cb.keypress @@ -790,15 +790,15 @@ options = ActionsKeybinds Close Options or QR Quick spoiler - Jump to page 0 Open QR with post number inserted Open QR without post number inserted Select next reply Select previous reply See next thread See previous thread - Jump next page - Jump previous page + Jump to the next page + Jump to the previous page + Jump to page 0 Open thread in current tab Open thread in new tab Expand thread