From 84cf95fe8f1bf9df1a31811e13994114aaa3be2a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 7 Mar 2019 11:52:10 +0300 Subject: Headlines.click: open original article when it makes sense to do so --- js/Headlines.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'js') diff --git a/js/Headlines.js b/js/Headlines.js index f15d68f0e..f161a6bea 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -171,11 +171,17 @@ define(["dojo/_base/declare"], function (declare) { if (Article.getActive() != id) { Article.setActive(id); - if (!App.getInitParam("cdm_expanded")) + if (App.getInitParam("cdm_expanded")) { + Article.openInNewWindow(id); + Headlines.toggleUnread(id, 0); + } else { Article.cdmScrollToId(id); + } } else if (in_body) { Headlines.toggleUnread(id, 0); + } else { + Article.openInNewWindow(id); } return in_body; -- cgit v1.2.3-54-g00ecf From 0b8f3909fe4d6b687955e101f624208c07fac88f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 7 Mar 2019 12:16:09 +0300 Subject: Headlines.click: fix another small issue with expanded mode --- js/Headlines.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'js') diff --git a/js/Headlines.js b/js/Headlines.js index f161a6bea..4487f5bea 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -169,9 +169,11 @@ define(["dojo/_base/declare"], function (declare) { if (App.isCombinedMode()) { if (Article.getActive() != id) { + + Headlines.select('none'); Article.setActive(id); - if (App.getInitParam("cdm_expanded")) { + if (App.getInitParam("cdm_expanded") && !in_body) { Article.openInNewWindow(id); Headlines.toggleUnread(id, 0); } else { @@ -186,6 +188,7 @@ define(["dojo/_base/declare"], function (declare) { return in_body; } else { + Headlines.select('none'); Article.view(id); } } -- cgit v1.2.3-54-g00ecf From ae9ef7fe84b905b977c98cc5108a570d6a638e62 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 7 Mar 2019 12:16:50 +0300 Subject: Headlines.click: fix another small issue with expanded mode (2) --- js/Headlines.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/Headlines.js b/js/Headlines.js index 4487f5bea..4b7e7b0c7 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -173,8 +173,10 @@ define(["dojo/_base/declare"], function (declare) { Headlines.select('none'); Article.setActive(id); - if (App.getInitParam("cdm_expanded") && !in_body) { - Article.openInNewWindow(id); + if (App.getInitParam("cdm_expanded")) { + if (!in_body) + Article.openInNewWindow(id); + Headlines.toggleUnread(id, 0); } else { Article.cdmScrollToId(id); -- cgit v1.2.3-54-g00ecf From 900cdbbb3129a40299eb11e11b4cb10d89ec4d7c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 7 Mar 2019 15:40:02 +0300 Subject: Headlines.click: open original article (and mark as read) on alt click on title --- js/Headlines.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'js') diff --git a/js/Headlines.js b/js/Headlines.js index 4b7e7b0c7..3c5ab2ee6 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -168,7 +168,12 @@ 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); @@ -184,14 +189,19 @@ define(["dojo/_base/declare"], function (declare) { } else if (in_body) { Headlines.toggleUnread(id, 0); - } else { + } else { /* !in body */ Article.openInNewWindow(id); } return in_body; } else { - Headlines.select('none'); - Article.view(id); + if (event.altKey) { + Article.openInNewWindow(id); + Headlines.toggleUnread(id, 0); + } else { + Headlines.select('none'); + Article.view(id); + } } } -- cgit v1.2.3-54-g00ecf