diff options
author | justauser <[email protected]> | 2013-07-07 13:54:10 -0400 |
---|---|---|
committer | justauser <[email protected]> | 2013-07-07 13:54:10 -0400 |
commit | e4e9ac1fc288d6715f6419cd4c8a44386362ecf0 (patch) | |
tree | c92f9b0f8790866881cd0fbe230ee0d35dfb09b2 /js/tt-rss.js | |
parent | 47fecba235400e0d7a5a7c54c9ff201c0840deec (diff) | |
parent | 1016a4ef38aba68bc6106015b10d6d3970b72d5e (diff) |
Merge branch 'master' of http://github.com/gothfox/Tiny-Tiny-RSS
updating from github]
Diffstat (limited to 'js/tt-rss.js')
-rw-r--r-- | js/tt-rss.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/js/tt-rss.js b/js/tt-rss.js index a1d7d6411..46e282351 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -847,11 +847,16 @@ function hotkey_handler(e) { 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; @@ -893,6 +898,8 @@ function hotkey_handler(e) { // ensure ^*char notation if (shift_key) hotkey = "*" + hotkey; if (ctrl_key) hotkey = "^" + hotkey; + if (alt_key) hotkey = "+" + hotkey; + if (meta_key) hotkey = "%" + hotkey; hotkey = hotkey_prefix ? hotkey_prefix + " " + hotkey : hotkey; hotkey_prefix = false; |