diff options
author | Andrew Dolgov <[email protected]> | 2019-03-08 10:12:06 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2019-03-08 10:12:06 +0300 |
commit | a34509c8aeaf57b96a12daf289fa7ec71346d2f0 (patch) | |
tree | e36b851642a287b0792525263e583151ed566e82 /js/Headlines.js | |
parent | 19f162dbe304d3e0f26e2c37fa29522924b7cede (diff) | |
parent | 900cdbbb3129a40299eb11e11b4cb10d89ec4d7c (diff) |
Merge branch 'master' of git.fakecake.org:tt-rss
Diffstat (limited to 'js/Headlines.js')
-rwxr-xr-x | js/Headlines.js | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/js/Headlines.js b/js/Headlines.js index f15d68f0e..3c5ab2ee6 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -168,19 +168,40 @@ define(["dojo/_base/declare"], function (declare) { } else { if (App.isCombinedMode()) { - if (Article.getActive() != id) { + if (event.altKey && !in_body) { + + Article.openInNewWindow(id); + Headlines.toggleUnread(id, 0); + + } else if (Article.getActive() != id) { + + Headlines.select('none'); Article.setActive(id); - if (!App.getInitParam("cdm_expanded")) + if (App.getInitParam("cdm_expanded")) { + if (!in_body) + Article.openInNewWindow(id); + + Headlines.toggleUnread(id, 0); + } else { Article.cdmScrollToId(id); + } } else if (in_body) { Headlines.toggleUnread(id, 0); + } else { /* !in body */ + Article.openInNewWindow(id); } return in_body; } else { - Article.view(id); + if (event.altKey) { + Article.openInNewWindow(id); + Headlines.toggleUnread(id, 0); + } else { + Headlines.select('none'); + Article.view(id); + } } } |