add quick action to edit current feed

[tt-rss.git] / viewfeed.js

diff --git a/viewfeed.js b/viewfeed.js
index e3aa51b05d62ff3130fd8adda9c66ba6bffa7388..70e8aaf0e8822aeb16399458f9b396cd794eca42 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -19,6 +19,9 @@ function headlines_callback() {
        if (xmlhttp.readyState == 4) {
                debug("headlines_callback");
                var f = document.getElementById("headlines-frame");
+               try {
+                       f.scrollTop = 0;
+               } catch (e) { };
                f.innerHTML = xmlhttp.responseText;
                update_all_counters();
                if (typeof correctPNG != 'undefined') {
@@ -32,6 +35,9 @@ function article_callback() {
        if (xmlhttp.readyState == 4) {
                debug("article_callback");
                var f = document.getElementById("content-frame");
+               try {
+                       f.scrollTop = 0;
+               } catch (e) { };
                f.innerHTML = xmlhttp.responseText;
                if (typeof correctPNG != 'undefined') {
                        correctPNG();
@@ -45,9 +51,6 @@ function view(id, feed_id) {
        try {
                debug("loading article: " + id + "/" + feed_id);
        
-               var f_document = getFeedsContext().document;
-               var m_document = document;
-       
                enableHotkeys();
        
                var crow = document.getElementById("RROW-" + id);
@@ -63,9 +66,9 @@ function view(id, feed_id) {
                } 
        
                active_post_id = id; 
-               setActiveFeedId(feed_id);
+               //setActiveFeedId(feed_id);
        
-               var content = m_document.getElementById("content-frame");
+               var content = document.getElementById("content-frame");
        
                selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
                markHeadline(active_post_id);
@@ -79,6 +82,7 @@ function view(id, feed_id) {
                        xmlhttp.send(null);
                } else {
                        debug("xmlhttp busy (@view)");
+                       printLockingError();
                }  
 
        } catch (e) {
@@ -88,8 +92,6 @@ function view(id, feed_id) {
 
 function toggleMark(id) {
 
-       var f_document = document;
-
        if (!xmlhttp_ready(xmlhttp_rpc)) {
                printLockingError();
                return;
@@ -98,7 +100,7 @@ function toggleMark(id) {
        var query = "backend.php?op=rpc&id=" + id + "&subop=mark";
 
        var mark_img = document.getElementById("FMARKPIC-" + id);
-       var vfeedu = f_document.getElementById("FEEDU--1");
+       var vfeedu = document.getElementById("FEEDU--1");
        var crow = document.getElementById("RROW-" + id);
 
        if (mark_img.alt != "Reset mark") {
@@ -121,8 +123,8 @@ function toggleMark(id) {
 
        }
 
-       var vfeedctr = f_document.getElementById("FEEDCTR--1");
-       var vfeedr = f_document.getElementById("FEEDR--1");
+       var vfeedctr = document.getElementById("FEEDCTR--1");
+       var vfeedr = document.getElementById("FEEDR--1");
 
        if (vfeedu && vfeedctr) {
                if ((+vfeedu.innerHTML) > 0) {
@@ -326,7 +328,7 @@ function selectionToggleMarked(cdm_mode) {
 
 function cdmGetSelectedArticles() {
        var sel_articles = new Array();
-       var container = document.getElementById("headlinesContainer");
+       var container = document.getElementById("headlinesInnerContainer");
 
        for (i = 0; i < container.childNodes.length; i++) {
                var child = container.childNodes[i];
@@ -342,7 +344,7 @@ function cdmGetSelectedArticles() {
 
 // mode = all,none,unread
 function cdmSelectArticles(mode) {
-       var container = document.getElementById("headlinesContainer");
+       var container = document.getElementById("headlinesInnerContainer");
 
        for (i = 0; i < container.childNodes.length; i++) {
                var child = container.childNodes[i];
@@ -401,35 +403,10 @@ function labelFromSearch(search, search_mode, match_on, feed_id, is_cat) {
                debug("LFS: " + query);
        
                xmlhttp_rpc.open("GET", query, true);
-               xmlhttp_rpc.onreadystatechange=getMainContext().dlg_frefresh_callback;
+               xmlhttp_rpc.onreadystatechange=dlg_frefresh_callback;
                xmlhttp_rpc.send(null);
        }
 
 }
 
 
-/*
-function headlines_init() {
-       if (arguments.callee.done) return;
-       arguments.callee.done = true;           
-
-       if (parent.frames["feeds-frame"]) {
-               document.onkeydown = hotkey_handler;
-       }
-
-       var hl = document.getElementById("headlinesList");
-
-       if (!hl) {
-               hl = document.getElementById("headlinesContainer");
-       }
-
-       var hw = hl.scrollHeight;
-       var pw = parent.document.getElementById("headlines").scrollHeight;
-
-       if (hw >= pw) {
-               var bt = document.getElementById("headlineActionsBottom");
-               bt.className = "headlinesSubToolbar";
-       }
-
-}
-*/