diff options
author | Andrew Dolgov <[email protected]> | 2013-01-22 13:00:20 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-01-22 13:00:20 +0400 |
commit | 3fb401120af97da49c8d1c414e9e62fc29d80927 (patch) | |
tree | 0487ae364b5b82d71714ec8788938315c60b85f4 | |
parent | e5e2cf3b88a33594777a5487f400e9c93d6b82cd (diff) |
support ctrl key hotkeys
-rw-r--r-- | include/functions.php | 3 | ||||
-rw-r--r-- | js/tt-rss.js | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/functions.php b/include/functions.php index ac3a8861e..f3c05fecb 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2077,10 +2077,11 @@ "g t" => "goto_tagcloud", "g P" => "goto_prefs", // "other" => array( - "(9)|tab" => "select_article_cursor", // tab + "(9)|Tab" => "select_article_cursor", // tab "c l" => "create_label", "c f" => "create_filter", "c s" => "collapse_sidebar", + "^(191)|Ctrl+/" => "help_dialog", ); global $pluginhost; diff --git a/js/tt-rss.js b/js/tt-rss.js index 13181c421..b97c052c1 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -645,11 +645,8 @@ function hotkey_handler(e) { var cmdline = $('cmdline'); - try { - shift_key = e.shiftKey; - } catch (e) { - - } + shift_key = e.shiftKey; + ctrl_key = e.ctrlKey; if (window.event) { keycode = window.event.keyCode; @@ -687,6 +684,7 @@ function hotkey_handler(e) { Element.hide(cmdline); var hotkey = keychar.search(/[a-zA-Z0-9]/) != -1 ? keychar : "(" + keycode + ")"; + if (ctrl_key) hotkey = "^" + hotkey; hotkey = hotkey_prefix ? hotkey_prefix + " " + hotkey : hotkey; hotkey_prefix = false; |