From 04e91733a76a70d193559cfda17e9d8072fe20a0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Fri, 16 May 2008 08:42:30 +0100
Subject: [PATCH] openArticleInNewWindow: add workaround for popup blockers

---
 functions.js | 16 ++++++++++++----
 help/3.php   |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/functions.js b/functions.js
index e309c5e70..f46bc60f0 100644
--- a/functions.js
+++ b/functions.js
@@ -75,10 +75,13 @@ function open_article_callback(transport) {
 
 			debug("open_article_callback, received link: " + link);
 
-			if (link) {
-				debug("link url: " + link.firstChild.nodeValue);
+			if (link && id) {
 
-				var w = window.open(link.firstChild.nodeValue, "_blank");
+				var wname = "ttrss_article_" + id.firstChild.nodeValue;
+
+				debug("link url: " + link.firstChild.nodeValue + ", wname " + wname);
+
+				var w = window.open(link.firstChild.nodeValue, wname);
 
 				if (!w) { notify_error("Failed to load article in new window"); }
 
@@ -1502,8 +1505,13 @@ function openArticleInNewWindow(id) {
 		debug("openArticleInNewWindow: " + id);
 
 		var query = "backend.php?op=rpc&subop=getArticleLink&id=" + id;
+		var wname = "ttrss_article_" + id;
+
+		debug(query + " " + wname);
+
+		var w = window.open("", wname);
 
-		debug(query);
+		if (!w) notify_error("Failed to open window for the article");
 
 		new Ajax.Request(query, {
 			onComplete: function(transport) { 
diff --git a/help/3.php b/help/3.php
index 0644c214a..009376f5d 100644
--- a/help/3.php
+++ b/help/3.php
@@ -17,7 +17,7 @@
 		<tr><td class='n'>shift-S</td><td><?php echo __("Toggle published") ?></td></tr>
 		<tr><td class='n'>u</td><td><?php echo __("Toggle unread") ?></td></tr>
 		<tr><td class='n'>t</td><td><?php echo __("Edit tags") ?></td></tr>
-		<!-- <tr><td class='n'>S</td><td>Edit score</td></tr> -->
+		<tr><td class='n'>o</td><td><?php echo __("Open article in new window") ?></td></tr>
 	</table>
 
 	<h2><?php echo __("Other actions") ?></h2>