add some hacks to hopefully mitigate headlines memory leaks

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

diff --git a/js/feedlist.js b/js/feedlist.js
index 7a5996a87e1dfea72e92d4ce54a27e790a6130d7..eb6cbdfee220c30c30b51700559548df27a34ac2 100644 (file)
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -35,7 +35,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 +51,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;
@@ -59,6 +77,7 @@ function viewfeed(params) {
                var infscroll_req = params.infscroll_req;
                var can_wait = params.can_wait;
                var viewfeed_debug = params.viewfeed_debug;
+               var method = params.method;
 
                if (is_cat == undefined)
                        is_cat = false;
@@ -81,6 +100,8 @@ function viewfeed(params) {
                        if (getActiveFeedId() != feed || !infscroll_req) {
                                setActiveArticleId(0);
                                _infscroll_disable = 0;
+
+                               cleanup_memory("headlines-frame");
                        }
 
                        if (infscroll_req) {
@@ -102,6 +123,8 @@ function viewfeed(params) {
                var query = "?op=feeds&method=view&feed=" + param_escape(feed) + "&" +
                        toolbar_query;
 
+               if (method) query += "&m=" + param_escape(method);
+
                if (offset > 0) {
                        if (current_first_id) {
                                query = query + "&fid=" + param_escape(current_first_id);
@@ -123,7 +146,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";
                                }
                        }
@@ -317,6 +340,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)