remove xml from getAllCounters rpc call, use pure JSON

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

diff --git a/tt-rss.js b/tt-rss.js
index 56c1f36ce7cd00665495205b9336a5b55a4add99..6d79943774f5c4e05a43d47e87a3fb7239863e2c 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -3,7 +3,6 @@ var global_unread = -1;
 var firsttime_update = true;
 var _active_feed_id = 0;
 var _active_feed_is_cat = false;
-var number_of_feeds = 0;
 var hotkey_prefix = false;
 var hotkey_prefix_pressed = false;
 var init_params = {};
@@ -50,15 +49,6 @@ function setActiveFeedId(id, is_cat) {
 }
 
 
-function dlg_frefresh_callback(transport, deleted_feed) {
-       if (getActiveFeedId() == deleted_feed) {
-               setTimeout("viewfeed(-5)", 100);
-       }
-
-       setTimeout('updateFeedList()', 50);
-       closeInfoBox();
-}
-
 function updateFeedList() {
        try {
 
@@ -85,6 +75,7 @@ function updateFeedList() {
                });
 
                var tree = new fox.FeedTree({
+               persist: false,
                model: treeModel,
                onOpen: function (item, node) {
                        var id = String(item.id);
@@ -216,7 +207,7 @@ function timeout() {
                        new Ajax.Request("backend.php", {
                                parameters: query_str,
                                onComplete: function(transport) { 
-                                               handle_rpc_reply(transport, !_force_scheduled_update);
+                                               handle_rpc_json(transport, !_force_scheduled_update);
                                                _force_scheduled_update = false;
                                        } });
 
@@ -481,21 +472,14 @@ function toggleDispRead() {
        }
 }
 
-function parse_runtime_info(elem) {
-
-       if (!elem || !elem.firstChild) {
-               console.warn("parse_runtime_info: invalid node passed");
-               return;
-       }
-
-       var data = JSON.parse(elem.firstChild.nodeValue);
+function parse_runtime_info(data) {
 
        //console.log("parsing runtime info...");
 
        for (k in data) {
                var v = data[k];
 
-               // console.log("RI: " + k + " => " + v);
+//             console.log("RI: " + k + " => " + v);
 
                if (k == "new_version_available") {
                        var icon = $("newVersionIcon");
@@ -521,6 +505,13 @@ function parse_runtime_info(elem) {
                        return;
                }
 
+               if (k == "max_feed_id" || k == "num_feeds") {
+                       if (init_params[k] != v) {
+                               console.log("feed count changed, need to reload feedlist.");
+                               updateFeedList();
+                       }
+               }
+
                init_params[k] = v;                                     
                notify('');
        }
@@ -638,7 +629,7 @@ function rescoreCurrentFeed() {
 function hotkey_handler(e) {
        try {
 
-               if (e.target.nodeName == "INPUT") return;
+               if (e.target.nodeName == "INPUT" || e.target.nodeName == "TEXTAREA") return;
 
                var keycode;
                var shift_key = false;
@@ -1046,12 +1037,12 @@ function handle_rpc_reply(transport, scheduled_call) {
                        var counters = transport.responseXML.getElementsByTagName("counters")[0];
        
                        if (counters)
-                               parse_counters(counters, scheduled_call);
+                               parse_counters(JSON.parse(counters.firstChild.nodeValue), scheduled_call);
 
                        var runtime_info = transport.responseXML.getElementsByTagName("runtime-info")[0];
 
                        if (runtime_info)
-                               parse_runtime_info(runtime_info);
+                               parse_runtime_info(JSON.parse(runtime_info.firstChild.nodeValue));
 
                        hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
 
@@ -1106,3 +1097,85 @@ function scheduleFeedUpdate(id, is_cat) {
                exception_error("scheduleFeedUpdate", e);
        }
 }
+
+function newVersionDlg() {
+       try {
+               var query = "backend.php?op=dlg&id=newVersion";
+
+               if (dijit.byId("newVersionDlg"))
+                       dijit.byId("newVersionDlg").destroyRecursive();
+
+               dialog = new dijit.Dialog({
+                       id: "newVersionDlg",
+                       title: __("New version available!"),
+                       style: "width: 600px",
+                       href: query,
+               });
+
+               dialog.show();
+
+       } catch (e) {
+               exception_error("newVersionDlg", e);
+       }
+}
+
+function handle_rpc_json(transport, scheduled_call) {
+       try {
+               var reply = JSON.parse(transport.responseText);
+
+               if (reply) {
+
+                       var error = reply['error'];
+
+                       if (error) {
+                               var code = error['code'];
+                               var msg = error['msg'];
+                               if (code != 0) {
+                                       fatalError(code, msg);
+                                       return false;
+                               }
+                       }
+
+                       var seq = reply['seq'];
+
+                       if (seq) {
+                               if (get_seq() != seq) {
+                                       console.log("[handle_rpc_json] sequence mismatch: " + seq + 
+                                               " (want: " + get_seq() + ")");
+                                       return true;
+                               }
+                       }
+
+                       var message = reply['message'];
+
+                       if (message) {
+                               if (message == "UPDATE_COUNTERS") {
+                                       console.log("need to refresh counters...");
+                                       setInitParam("last_article_id", -1);
+                                       _force_scheduled_update = true;
+                               }
+                       }
+
+                       var counters = reply['counters'];
+       
+                       if (counters)
+                               parse_counters(counters, scheduled_call);
+
+                       var runtime_info = reply['runtime-info'];;
+
+                       if (runtime_info)
+                               parse_runtime_info(runtime_info);
+
+                       hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
+
+               } else {
+                       notify_error("Error communicating with server.");
+               }
+
+       } catch (e) {
+               exception_error("handle_rpc_json", e, transport);
+       }
+
+       return true;
+}
+