handle_rpc_json: fix netalert button never appearing on JSON parse error

[tt-rss.git] / js / feedlist.js

diff --git a/js/feedlist.js b/js/feedlist.js
index d6eaf17c8640c449b3dfef399b0b3d04a4fe1323..6d37377a45b327868bf4f4b1f838408d5927e400 100644 (file)
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -6,10 +6,15 @@ var _viewfeed_last = 0;
 var _viewfeed_timeout = false;
 
 var counters_last_request = 0;
+var _counters_prev = [];
 
-function viewCategory(cat) {
+/*function viewCategory(cat) {
        viewfeed({feed: cat, is_cat: true});
        return false;
+}*/
+
+function resetCounterCache() {
+       _counters_prev = [];
 }
 
 function loadMoreHeadlines() {
@@ -35,7 +40,8 @@ function loadMoreHeadlines() {
                        offset = unread_in_buffer;
                } else if (_search_query) {
                        offset = num_all;
-               } else if (view_mode == "adaptive") {
+               } else if (view_mode == "adaptive" && !(getActiveFeedId() == -1 && !activeFeedIsCat())) {
+                       // ^ starred feed shows both unread & read articles in adaptive mode
                        offset = num_unread > 0 ? unread_in_buffer : num_all;
                } else {
                        offset = num_all;
@@ -50,6 +56,23 @@ function loadMoreHeadlines() {
        }
 }
 
+function cleanup_memory(root) {
+       try {
+               var dijits = dojo.query("[widgetid]", dijit.byId(root).domNode).map(dijit.byNode);
+
+               dijits.each(function (d) {
+                       dojo.destroy(d.domNode);
+               });
+
+               $$("#" + root + " *").each(function (i) {
+                       i.parentNode ? i.parentNode.removeChild(i) : true;
+               });
+       } catch (e) {
+               console.log("cleanup_memory: exception");
+               console.log(e);
+       }
+}
+
 function viewfeed(params) {
        try {
                var feed = params.feed;
@@ -82,6 +105,9 @@ function viewfeed(params) {
                        if (getActiveFeedId() != feed || !infscroll_req) {
                                setActiveArticleId(0);
                                _infscroll_disable = 0;
+
+                               cleanup_memory("headlines-frame");
+                               _headlines_scroll_offset = 0;
                        }
 
                        if (infscroll_req) {
@@ -126,7 +152,7 @@ function viewfeed(params) {
                                        query = query + "&vgrlf=" + param_escape(vgroup_last_feed);
                                }
                        } else {
-                               if (!is_cat && feed == getActiveFeedId()) {
+                               if (!is_cat && feed == getActiveFeedId() && !params.method) {
                                        query = query + "&m=ForceUpdate";
                                }
                        }
@@ -177,7 +203,7 @@ function feedlist_init() {
                loading_set_progress(50);
 
                document.onkeydown = hotkey_handler;
-               setTimeout("hotkey_prefix_timeout()", 5*1000);
+               setTimeout(hotkey_prefix_timeout, 5*1000);
 
                if (!getActiveFeedId()) {
                        viewfeed({feed: -3});
@@ -232,10 +258,44 @@ function request_counters(force) {
        }
 }
 
-function parse_counters(elems, scheduled_call) {
+// NOTE: this implementation is incomplete
+// for general objects but good enough for counters
+// http://adripofjavascript.com/blog/drips/object-equality-in-javascript.html
+function counter_is_equal(a, b) {
+       // Create arrays of property names
+       var aProps = Object.getOwnPropertyNames(a);
+       var bProps = Object.getOwnPropertyNames(b);
+
+       // If number of properties is different,
+       // objects are not equivalent
+       if (aProps.length != bProps.length) {
+               return false;
+       }
+
+       for (var i = 0; i < aProps.length; i++) {
+               var propName = aProps[i];
+
+               // If values of same property are not equal,
+               // objects are not equivalent
+               if (a[propName] !== b[propName]) {
+                       return false;
+               }
+       }
+
+       // If we made it this far, objects
+       // are considered equivalent
+       return true;
+}
+
+
+function parse_counters(elems) {
        try {
                for (var l = 0; l < elems.length; l++) {
 
+                       if (_counters_prev[l] && counter_is_equal(elems[l], _counters_prev[l])) {
+                               continue;
+                       }
+
                        var id = elems[l].id;
                        var kind = elems[l].kind;
                        var ctr = parseInt(elems[l].counter);
@@ -251,13 +311,13 @@ function parse_counters(elems, scheduled_call) {
                        }
 
                        if (id == "subscribed-feeds") {
-                               feeds_found = ctr;
+                               /* feeds_found = ctr; */
                                continue;
                        }
 
-                       if (getFeedUnread(id, (kind == "cat")) != ctr ||
+                       /*if (getFeedUnread(id, (kind == "cat")) != ctr ||
                                        (kind == "cat")) {
-                       }
+                       }*/
 
                        setFeedUnread(id, (kind == "cat"), ctr);
                        setFeedValue(id, (kind == "cat"), 'auxcounter', auxctr);
@@ -279,6 +339,8 @@ function parse_counters(elems, scheduled_call) {
 
                hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
 
+               _counters_prev = elems;
+
        } catch (e) {
                exception_error("parse_counters", e);
        }
@@ -320,6 +382,9 @@ function hideOrShowFeeds(hide) {
 }
 
 function getFeedName(feed, is_cat) {
+
+       if (isNaN(feed)) return feed; // it's a tag
+
        var tree = dijit.byId("feedTree");
 
        if (tree && tree.model)
@@ -422,7 +487,51 @@ function catchupFeedInGroup(id) {
                var str = __("Mark all articles in %s as read?").replace("%s", title);
 
                if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
-                       return viewCurrentFeed('MarkAllReadGR:' + id);
+
+                       var rows = $$("#headlines-frame > div[id*=RROW][data-orig-feed-id='"+id+"']");
+
+                       if (rows.length > 0) {
+
+                               rows.each(function (row) {
+                                       row.removeClassName("Unread");
+
+                                       if (row.getAttribute("data-article-id") != getActiveArticleId()) {
+                                               new Effect.Fade(row, {duration: 0.5});
+                                       }
+
+                               });
+
+                               var feedTitles = $$("#headlines-frame > div[class='cdmFeedTitle']");
+
+                               for (var i = 0; i < feedTitles.length; i++) {
+                                       if (feedTitles[i].getAttribute("data-feed-id") == id) {
+
+                                               if (i < feedTitles.length - 1) {
+                                                       new Effect.Fade(feedTitles[i], {duration: 0.5});
+                                               }
+
+                                               break;
+                                       }
+                               }
+
+                               updateFloatingTitle(true);
+                       }
+
+                       var catchup_query = "?op=rpc&method=catchupFeed&feed_id=" +
+                                       id + "&is_cat=false";
+
+                       console.log(catchup_query);
+
+                       notify_progress("Loading, please wait...", true);
+
+                       new Ajax.Request("backend.php", {
+                               parameters: catchup_query,
+                               onComplete: function (transport) {
+                                       handle_rpc_json(transport);
+                               }
+                       } );
+
+                       //return viewCurrentFeed('MarkAllReadGR:' + id);
                }
 
        } catch (e) {