1
0
mirror of https://tt-rss.org/git/tt-rss.git synced 2024-07-01 12:40:50 +02:00

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
This commit is contained in:
Andrew Dolgov 2016-02-07 22:17:03 +03:00
commit 378873b59a

View File

@ -1755,7 +1755,7 @@ function cdmClicked(event, id) {
try { try {
//var shift_key = event.shiftKey; //var shift_key = event.shiftKey;
if (!event.ctrlKey) { if (!event.ctrlKey && !event.metaKey) {
if (!getInitParam("cdm_expanded")) { if (!getInitParam("cdm_expanded")) {
return cdmExpandArticle(id); return cdmExpandArticle(id);
@ -1824,7 +1824,7 @@ function hlClicked(event, id) {
if (event.which == 2) { if (event.which == 2) {
view(id); view(id);
return true; return true;
} else if (event.ctrlKey) { } else if (event.ctrlKey || event.metaKey) {
toggleSelected(id, true); toggleSelected(id, true);
toggleUnread(id, 0, false); toggleUnread(id, 0, false);
openArticleInNewWindow(id); openArticleInNewWindow(id);