From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 22 Jan 2013 09:00:20 +0000 (+0400)
Subject: support ctrl key hotkeys
X-Git-Tag: 1.7.0~42
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=3fb401120af97da49c8d1c414e9e62fc29d80927;p=tt-rss.git

support ctrl key hotkeys
---

diff --git a/include/functions.php b/include/functions.php
index ac3a8861..f3c05fec 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 13181c42..b97c052c 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;