diff options
author | Andrew Dolgov <[email protected]> | 2011-01-18 12:42:07 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2011-01-18 12:42:07 +0300 |
commit | 9ad5399186f2a56dc9e628f7f64e9ef5e8efbeb5 (patch) | |
tree | a76c6e783b09f33ce2ddd9c921602e67c3c8fecf | |
parent | d026d372b552f9fd4bac4614a8491fa59b947c41 (diff) |
fix x hotkey firing simultaneously with X
-rw-r--r-- | tt-rss.js | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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; } } } |