js: misc fixes, code cleanup

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

diff --git a/tt-rss.js b/tt-rss.js
index 4226fd8da4e28a3f4d927e72fda284759f89e374..abd0f673e70e72de4964d97ead7eabfe2b4beb72 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -10,8 +10,6 @@ var hotkey_prefix_pressed = false;
 var init_params = {};
 var ver_offset = 0;
 var hor_offset = 0;
-var feeds_sort_by_unread = false;
-var feedlist_sortable_enabled = false;
 var _force_scheduled_update = false;
 var last_scheduled_update = false;
 
@@ -203,11 +201,11 @@ function timeout() {
                        new Ajax.Request("backend.php", {
                                parameters: query_str,
                                onComplete: function(transport) { 
-                                               handle_rpc_reply(transport, true);
+                                               handle_rpc_reply(transport, !_force_scheduled_update);
+                                               _force_scheduled_update = false;
                                        } });
 
                        last_scheduled_update = ts;
-                       _force_scheduled_update = false;
                }
 
        } catch (e) {
@@ -831,7 +829,6 @@ function hotkey_handler(e) {
                var shift_key = false;
 
                var cmdline = $('cmdline');
-               var feedlist = $('feedList');
 
                try {
                        shift_key = e.shiftKey;
@@ -1118,11 +1115,6 @@ function hotkey_handler(e) {
                                return resort_feedlist();
                        }
 
-                       if (keycode == 72) { // h
-                               hideReadHeadlines();
-                               return;
-                       }
-
                        if (keycode == 88) { // x
                                reverseHeadlineOrder();
                                return;
@@ -1233,10 +1225,6 @@ function hotkey_handler(e) {
        }
 }
 
-function feedsSortByUnread() {
-       return feeds_sort_by_unread;
-}
-
 function inPreferences() {
        return false;
 }
@@ -1291,6 +1279,7 @@ function handle_rpc_reply(transport, scheduled_call) {
                                message = message.firstChild.nodeValue;
 
                                if (message == "UPDATE_COUNTERS") {
+                                       console.log("need to refresh counters...");
                                        setInitParam("last_article_id", -1);
                                        _force_scheduled_update = true;
                                }