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

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