From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 22 Jan 2013 08:52:52 +0000 (+0400)
Subject: add hack to support arbitrary key descriptions for hotkeys
X-Git-Tag: 1.7.0~43
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=e5e2cf3b88a33594777a5487f400e9c93d6b82cd;p=tt-rss.git

add hack to support arbitrary key descriptions for hotkeys
---

diff --git a/classes/backend.php b/classes/backend.php
index 6fa31864..0b6e6bd3 100644
--- a/classes/backend.php
+++ b/classes/backend.php
@@ -44,6 +44,12 @@ class Backend extends Handler {
 			print "<li><h3>" . $section . "</h3></li>";
 
 			foreach ($hotkeys as $action => $description) {
+				if (strpos($omap[$action], "|") !== FALSE) {
+					$omap[$action] = substr($omap[$action],
+						strpos($omap[$action], "|")+1,
+						strlen($omap[$action]));
+				}
+
 				print "<li>";
 			 	print "<span class='hksequence'>" . $omap[$action] . "</span>";
 			  	print $description;
diff --git a/include/functions.php b/include/functions.php
index b564caf1..ac3a8861 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2035,9 +2035,9 @@
 				"j" => "prev_feed",
 				"n" => "next_article",
 				"p" => "prev_article",
-				"(38)" => "prev_article",
-				"(40)" => "next_article",
-				"(191)" => "search_dialog",
+				"(38)|up" => "prev_article",
+				"(40)|down" => "next_article",
+				"(191)|/" => "search_dialog",
 //			"article" => array(
 				"s" => "toggle_mark",
 				"S" => "toggle_publ",
@@ -2077,7 +2077,7 @@
 				"g t" => "goto_tagcloud",
 				"g P" => "goto_prefs",
 //			"other" => array(
-				"(9)" => "select_article_cursor", // tab
+				"(9)|tab" => "select_article_cursor", // tab
 				"c l" => "create_label",
 				"c f" => "create_filter",
 				"c s" => "collapse_sidebar",
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 78f7a867..13181c42 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -366,6 +366,17 @@ function init_second_stage() {
 		if ('sessionStorage' in window && window['sessionStorage'] !== null)
 			sessionStorage.clear();
 
+		var hotkeys = getInitParam("hotkeys");
+		var tmp = [];
+
+		for (sequence in hotkeys[1]) {
+			filtered = sequence.replace(/\|.*$/, "");
+			tmp[filtered] = hotkeys[1][sequence];
+		}
+
+		hotkeys[1] = tmp;
+		setInitParam("hotkeys", hotkeys);
+
 		console.log("second stage ok");
 
 	} catch (e) {