public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 16:15:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of git.fakecake.org:tt-rss

Browse Source
This commit is contained in:
Andrew Dolgov
2019-03-08 10:12:06 +03:00
parent 19f162dbe3 900cdbbb31
commit a34509c8ae
10 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
js/Headlines.js
View File

@@ -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);
}
}
}