add post header menu

[tt-rss.git] / viewfeed.js

diff --git a/viewfeed.js b/viewfeed.js
index 3914c757d9bee13fc60fd26b57a2b5b1d1dd9e6e..dadbe94852fd021e8234a4b18abdb93a5bba8953 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -104,6 +104,8 @@ function headlines_callback2(transport, feed_cur_page) {
                                        dijit.byId("headlines-toolbar").attr('content',
                                                headlines_toolbar.firstChild.nodeValue);
 
+                                       initHeadlinesMenu();
+
                                        var cache_prefix = "";
 
                                        if (is_cat) {
@@ -143,6 +145,8 @@ function headlines_callback2(transport, feed_cur_page) {
                                                        markHeadline(ids[i]);
                                                }
 
+                                               initHeadlinesMenu();
+
                                        } else {
                                                console.log("no new headlines received");
                                        }
@@ -206,13 +210,13 @@ function render_article(article) {
                dijit.byId("headlines-wrap-inner").addChild(
                                dijit.byId("content-insert"));
 
-               var c = $("content-insert");
+               var c = dijit.byId("content-insert");
 
                try {
-                       c.scrollTop = 0;
+                       c.domNode.scrollTop = 0;
                } catch (e) { };
                
-               c.innerHTML = article;
+               c.attr('content', article);
 
                correctHeadlinesOffset(getActiveArticleId());           
 
@@ -2069,7 +2073,7 @@ function postClicked(event, id) {
                if (!event.ctrlKey) {
                        return true;
                } else {
-                       zoomToArticle(event, id);
+                       postOpenInNewTab(event, id);
                        return false;
                }
 
@@ -2083,6 +2087,11 @@ function hlOpenInNewTab(event, id) {
        zoomToArticle(event, id);
 }
 
+function postOpenInNewTab(event, id) {
+       closeArticlePanel(id);
+       zoomToArticle(event, id);
+}
+
 function hlClicked(event, id) {
        try {
 
@@ -2113,49 +2122,8 @@ function getLastVisibleHeadlineId() {
 }
 
 function openArticleInNewWindow(id) {
-       try {
-               console.log("openArticleInNewWindow: " + id);
-
-               var query = "?op=rpc&subop=getArticleLink&id=" + id;
-               var wname = "ttrss_article_" + id;
-
-               console.log(query + " " + wname);
-
-               var w = window.open("", wname);
-
-               if (!w) notify_error("Failed to open window for the article");
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-
-                                       var link = transport.responseXML.getElementsByTagName("link")[0];
-                                       var id = transport.responseXML.getElementsByTagName("id")[0];
-               
-                                       console.log("open_article received link: " + link);
-               
-                                       if (link && id) {
-               
-                                               var wname = "ttrss_article_" + id.firstChild.nodeValue;
-               
-                                               console.log("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"); }
-               
-                                               if (id) {
-                                                       id = id.firstChild.nodeValue;
-                                                       window.setTimeout("toggleUnread(" + id + ", 0)", 100);
-                                               }
-                                       } else {
-                                               notify_error("Can't open article: received invalid article link");
-                                       }
-                               } });
-
-       } catch (e) {
-               exception_error("openArticleInNewWindow", e);
-       }
+       toggleUnread(id, 0, false);
+       window.open("backend.php?op=la&id=" + id);
 }
 
 function isCdmMode() {
@@ -2256,3 +2224,58 @@ function closeArticlePanel() {
                                dijit.byId("content-insert"));
        }
 }
+
+function initHeadlinesMenu() {
+       try {
+               if (dijit.byId("headlinesMenu"))
+                       dijit.byId("headlinesMenu").destroyRecursive();
+
+               var ids = [];
+               var nodes = $$("#headlines-frame > div[id*=RROW]");
+
+               nodes.each(function(node) {
+                       ids.push(node.id);
+               });
+
+               var menu = new dijit.Menu({
+                       id: "headlinesMenu",
+                       targetNodeIds: ids,
+               });
+
+               var tmph = dojo.connect(menu, '_openMyself', function (event) {
+                       var callerNode = event.target, match = null, tries = 0;
+
+                       while (match == null && callerNode && tries <= 3) {
+                               match = callerNode.id.match("^[A-Z]+[-]([0-9]+)$");
+                               callerNode = callerNode.parentNode;
+                               ++tries;
+                       }
+
+                       if (match) this.callerRowId = parseInt(match[1]);
+
+               });
+
+               menu.addChild(new dijit.MenuItem({
+                       label: __("View article"),
+                       onClick: function(event) {
+                               view(this.getParent().callerRowId);
+                       }}));
+
+               menu.addChild(new dijit.MenuItem({
+                       label: __("View in a new tab"),
+                       onClick: function(event) {
+                               hlOpenInNewTab(event, this.getParent().callerRowId);
+                       }}));
+
+               menu.addChild(new dijit.MenuItem({
+                       label: __("Open original article"),
+                       onClick: function(event) {
+                               openArticleInNewWindow(this.getParent().callerRowId);
+                       }}));
+
+               menu.startup();
+
+       } catch (e) {
+               exception_error("initHeadlinesMenu", e);
+       }
+}