summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-07-06 00:46:44 -0700
committerAndrew Dolgov <[email protected]>2013-07-06 00:46:44 -0700
commitcc89ff5be3e7fe2ed926db7e0ee3b81c2b072f88 (patch)
tree2d82ace89dfcc2d9e00129023c146859fa805cef
parent80028907b5504a8ea5290e6334f6e44d27984250 (diff)
parentc65bd1027ab46848493973da0515640a93815d27 (diff)
Merge pull request #247 from TheSpyder/hotkey_fixes
Hotkey fixes
-rw-r--r--js/tt-rss.js7
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;