diff options
author | Andrew Dolgov <[email protected]> | 2017-05-05 11:41:49 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2017-05-05 11:41:49 +0300 |
commit | a97e8cddf7bf2e720a87191c8330e2d91175b045 (patch) | |
tree | c5b3d32e5dc00fbda8fc4aab0ebefd26213ee780 /js/tt-rss.js | |
parent | 0ae7de6d91a5a0bfbb6a41e8aa2c425f2b38fedb (diff) |
hotkey_handler: cleanup things a bit
Diffstat (limited to 'js/tt-rss.js')
-rw-r--r-- | js/tt-rss.js | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/js/tt-rss.js b/js/tt-rss.js index 4830fd43e..c3a5a5fd4 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -851,25 +851,16 @@ function hotkey_handler(e) { if (e.target.nodeName == "INPUT" || e.target.nodeName == "TEXTAREA") return; var keycode = false; - var shift_key = false; - var ctrl_key = false; - var alt_key = false; - var meta_key = false; var cmdline = $('cmdline'); - shift_key = e.shiftKey; - ctrl_key = e.ctrlKey; - alt_key = e.altKey; - meta_key = e.metaKey; - if (window.event) { keycode = window.event.keyCode; } else if (e) { keycode = e.which; } - var keychar = String.fromCharCode(keycode); + var keychar = String.fromCharCode(keycode).toLowerCase(); if (keycode == 27) { // escape hotkey_prefix = false; @@ -878,8 +869,6 @@ function hotkey_handler(e) { if (keycode == 16) return; // ignore lone shift if (keycode == 17) return; // ignore lone ctrl - keychar = keychar.toLowerCase(); - var hotkeys = getInitParam("hotkeys"); if (!hotkey_prefix && hotkeys[0].indexOf(keychar) != -1) { @@ -904,10 +893,10 @@ function hotkey_handler(e) { var hotkey = keychar.search(/[a-zA-Z0-9]/) != -1 ? keychar : "(" + keycode + ")"; // ensure ^*char notation - if (shift_key) hotkey = "*" + hotkey; - if (ctrl_key) hotkey = "^" + hotkey; - if (alt_key) hotkey = "+" + hotkey; - if (meta_key) hotkey = "%" + hotkey; + if (e.shiftKey) hotkey = "*" + hotkey; + if (e.ctrlKey) hotkey = "^" + hotkey; + if (e.altKey) hotkey = "+" + hotkey; + if (e.metaKey) hotkey = "%" + hotkey; hotkey = hotkey_prefix ? hotkey_prefix + " " + hotkey : hotkey; hotkey_prefix = false; |