editFilter: fix selector expressions broken by 88946d3

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

diff --git a/js/feedlist.js b/js/feedlist.js
index c98cfaab5941ed5f7c737bc4f07a7e74dd987d7e..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() {
@@ -198,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});
@@ -253,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);
@@ -272,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);
@@ -300,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);
        }