config: remove option ENABLE_UPDATE_DAEMON

[tt-rss.git] / feedlist.js

diff --git a/feedlist.js b/feedlist.js
index 9270ea4bfdd9bc721996de76d90a141ac840ed0e..954a67c162a7badd6cfdd9081f6f51a4ad3345b7 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -44,7 +44,7 @@ function viewfeed(feed, subop, is_cat, offset) {
 /*             if (getInitParam("theme") == "" || getInitParam("theme") == "compact") {
                        if (getInitParam("hide_feedlist") == 1) {
                                Element.hide("feeds-holder");
-                       }               
+                       }
                } */
 
                dijit.byId("content-tabs").selectChild(
@@ -79,11 +79,10 @@ function viewfeed(feed, subop, is_cat, offset) {
                                return;
                        }
 
-                       _infscroll_request_sent = timestamp;                    
+                       _infscroll_request_sent = timestamp;
                }
 
                hideAuxDlg();
-               closeInfoBox();
 
                Form.enable("main_toolbar_form");
 
@@ -141,8 +140,8 @@ function viewfeed(feed, subop, is_cat, offset) {
 
                console.log(query);
 
-               var unread_ctr = -1;
-               
+/*             var unread_ctr = -1;
+
                if (!is_cat) unread_ctr = getFeedUnread(feed);
 
                var cache_check = false;
@@ -150,7 +149,7 @@ function viewfeed(feed, subop, is_cat, offset) {
                if (unread_ctr != -1 && !page_offset && !force_nocache && !subop) {
 
                        var cache_prefix = "";
-                               
+
                        if (is_cat) {
                                cache_prefix = "C:";
                        } else {
@@ -164,14 +163,14 @@ function viewfeed(feed, subop, is_cat, offset) {
                if (cache_check) {
 
                        setActiveFeedId(feed, is_cat);
-               
-                       $("headlines-frame").innerHTML = cache_find_param(cache_prefix + feed, 
+
+                       $("headlines-frame").innerHTML = cache_find_param(cache_prefix + feed,
                                unread_ctr);
 
                        request_counters();
                        remove_splash();
 
-               } else {
+               } else { */
 
                        if (!is_cat) {
                                if (!setFeedExpandoIcon(feed, is_cat, 'images/indicator_white.gif'))
@@ -182,34 +181,30 @@ function viewfeed(feed, subop, is_cat, offset) {
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
-                               onComplete: function(transport) { 
+                               onComplete: function(transport) {
                                        setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif');
-                                       headlines_callback2(transport, page_offset); 
+                                       headlines_callback2(transport, page_offset);
                                } });
-               }
+//             }
 
        } catch (e) {
                exception_error("viewfeed", e);
-       }               
+       }
 }
 
 function feedlist_init() {
        try {
                console.log("in feedlist init");
-               
+
                hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
                document.onkeydown = hotkey_handler;
                setTimeout("hotkey_prefix_timeout()", 5*1000);
 
                 if (!getActiveFeedId()) {
-                       if (getInitParam("cdm_auto_catchup") != 1) {
-                               setTimeout("viewfeed(-3)", 100);
-                       } else {
-                               setTimeout("viewfeed(-5)", 100);
-                       }
-               } 
+                       setTimeout("viewfeed(-3)", 100);
+               }
 
-               console.log("T:" + 
+               console.log("T:" +
                                getInitParam("cdm_auto_catchup") + " " + getFeedUnread(-3));
 
                hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
@@ -231,9 +226,9 @@ function request_counters_real() {
 
                new Ajax.Request("backend.php", {
                        parameters: query,
-                       onComplete: function(transport) { 
+                       onComplete: function(transport) {
                                try {
-                                       handle_rpc_reply(transport);
+                                       handle_rpc_json(transport);
                                } catch (e) {
                                        exception_error("viewfeed/getcounters", e);
                                }
@@ -287,13 +282,11 @@ function displayNewContentPrompt(id) {
        }
 }
 
-function parse_counters(reply, scheduled_call) {
+function parse_counters(elems, scheduled_call) {
        try {
 
                var feeds_found = 0;
 
-               var elems = JSON.parse(reply.firstChild.nodeValue);
-
                for (var l = 0; l < elems.length; l++) {
 
                        var id = elems[l].id
@@ -303,7 +296,7 @@ function parse_counters(reply, scheduled_call) {
                        var has_img = elems[l].has_img;
                        var updated = elems[l].updated;
                        var title = elems[l].title;
-       
+
                        if (id == "global-unread") {
                                global_unread = ctr;
                                updateTitle();
@@ -319,7 +312,7 @@ function parse_counters(reply, scheduled_call) {
 
                        // TODO: enable new content notification for categories
 
-                       if (!activeFeedIsCat() && id == getActiveFeedId() 
+                       if (!activeFeedIsCat() && id == getActiveFeedId()
                                        && ctr > getFeedUnread(id) && scheduled_call) {
                                displayNewContentPrompt(id);
                        }
@@ -327,12 +320,12 @@ function parse_counters(reply, scheduled_call) {
                        setFeedUnread(id, (kind == "cat"), ctr);
 
                        if (kind != "cat") {
-                               //setFeedValue(id, false, 'error', error);
+                               setFeedValue(id, false, 'error', error);
                                setFeedValue(id, false, 'updated', updated);
 
                                if (id > 0) {
                                        if (has_img) {
-                                               setFeedIcon(id, false, 
+                                               setFeedIcon(id, false,
                                                        getInitParam("icons_url") + "/" + id + ".ico");
                                        } else {
                                                setFeedIcon(id, false, 'images/blank_icon.gif');
@@ -340,7 +333,7 @@ function parse_counters(reply, scheduled_call) {
                                }
                        }
                }
-       
+
                hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
 
        } catch (e) {
@@ -352,7 +345,7 @@ function getFeedUnread(feed, is_cat) {
        try {
                var tree = dijit.byId("feedTree");
 
-               if (tree && tree.model) 
+               if (tree && tree.model)
                        return tree.model.getFeedUnread(feed, is_cat);
 
        } catch (e) {
@@ -373,20 +366,20 @@ function hideOrShowFeeds(hide) {
                return tree.hideRead(hide, getInitParam("hide_read_shows_special"));
 }
 
-function getFeedName(feed, is_cat) {   
+function getFeedName(feed, is_cat) {
        var tree = dijit.byId("feedTree");
 
-       if (tree && tree.model) 
+       if (tree && tree.model)
                return tree.model.getFeedValue(feed, is_cat, 'name');
 }
 
-function getFeedValue(feed, is_cat, key) {     
+function getFeedValue(feed, is_cat, key) {
        try {
                var tree = dijit.byId("feedTree");
 
-               if (tree && tree.model) 
+               if (tree && tree.model)
                        return tree.model.getFeedValue(feed, is_cat, key);
-       
+
        } catch (e) {
                //
        }
@@ -397,7 +390,7 @@ function setFeedUnread(feed, is_cat, unread) {
        try {
                var tree = dijit.byId("feedTree");
 
-               if (tree && tree.model) 
+               if (tree && tree.model)
                        return tree.model.setFeedUnread(feed, is_cat, unread);
 
        } catch (e) {
@@ -409,7 +402,7 @@ function setFeedValue(feed, is_cat, key, value) {
        try {
                var tree = dijit.byId("feedTree");
 
-               if (tree && tree.model) 
+               if (tree && tree.model)
                        return tree.model.setFeedValue(feed, is_cat, key, value);
 
        } catch (e) {