summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2016-02-07 22:17:03 +0300
committerAndrew Dolgov <[email protected]>2016-02-07 22:17:03 +0300
commit378873b59afef40bbc6bf507032a453bc741808d (patch)
tree06c296bb274bbf6d3bc5ab2e52ca06ef8d7cf44d
parent50bda3fefbff31e5a5503d6fd1a927412fe29026 (diff)
parent2757c4938733e0d485647a83c2520d5d51e2ae61 (diff)
Merge branch 'new_tab_mac_fix' into 'master'
Make "open in new tab" hotkey handler support mac "cmd+click" way (non-expanded mode) https://tt-rss.org/forum/viewtopic.php?f=10&t=3682 See merge request !25
-rwxr-xr-xjs/viewfeed.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 181a932e0..9bf8e9355 100755
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1755,7 +1755,7 @@ function cdmClicked(event, id) {
try {
//var shift_key = event.shiftKey;
- if (!event.ctrlKey) {
+ if (!event.ctrlKey && !event.metaKey) {
if (!getInitParam("cdm_expanded")) {
return cdmExpandArticle(id);
@@ -1824,7 +1824,7 @@ function hlClicked(event, id) {
if (event.which == 2) {
view(id);
return true;
- } else if (event.ctrlKey) {
+ } else if (event.ctrlKey || event.metaKey) {
toggleSelected(id, true);
toggleUnread(id, 0, false);
openArticleInNewWindow(id);