From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 18 Jan 2011 09:42:07 +0000 (+0300)
Subject: fix x hotkey firing simultaneously with X
X-Git-Tag: 1.5.1~5
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9ad5399186f2a56dc9e628f7f64e9ef5e8efbeb5;p=tt-rss.git

fix x hotkey firing simultaneously with X
---

diff --git a/tt-rss.js b/tt-rss.js
index 3bc0ea4a..5884d8d4 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -743,10 +743,12 @@ function hotkey_handler(e) {
 
 			if (keycode == 68 && shift_key) { // shift-D
 				dismissSelectedArticles();
+				return;
 			}
 
 			if (keycode == 88 && shift_key) { // shift-X
 				dismissReadArticles();
+				return;
 			}
 
 			if (keycode == 78 || keycode == 40) { // n, down
@@ -814,9 +816,10 @@ function hotkey_handler(e) {
 				}
 			}
 
-			if (keycode == 88) { // x
+			if (keycode == 88 && !shift_key) { // x
 				if (activeFeedIsCat()) {
 					dijit.byId("feedTree").collapseCat(getActiveFeedId());
+					return;
 				}
 			}
 		}