]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.js
remove xml from getAllCounters rpc call, use pure JSON
[tt-rss.git] / tt-rss.js
index aa23ea075be67f7e24146b85c61d619e9525b1eb..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;
                                        } });
 
@@ -231,8 +222,26 @@ function timeout() {
 }
 
 function search() {
-       closeInfoBox(); 
-       viewCurrentFeed();
+       var query = "backend.php?op=dlg&id=search&param=" +
+               param_escape(getActiveFeedId() + ":" + activeFeedIsCat());
+
+       if (dijit.byId("searchDlg"))
+               dijit.byId("searchDlg").destroyRecursive();
+
+       dialog = new dijit.Dialog({
+               id: "searchDlg",
+               title: __("Search"),
+               style: "width: 600px",
+               execute: function() {
+                       if (this.validate()) {
+                               _search_query = dojo.objectToQuery(this.attr('value'));
+                               this.hide();
+                               viewCurrentFeed();
+                       }
+               },
+               href: query});
+
+       dialog.show();
 }
 
 function updateTitle() {
@@ -265,7 +274,7 @@ function genericSanityCheck() {
 
 function init() {
        try {
-               Form.disable("main_toolbar_form");
+               //Form.disable("main_toolbar_form");
 
                dojo.require("dijit.layout.BorderContainer");
                dojo.require("dijit.layout.TabContainer");
@@ -276,9 +285,15 @@ function init() {
                dojo.require("dojo.data.ItemFileWriteStore");
                dojo.require("dijit.Tree");
                dojo.require("dijit.form.Select");
+               dojo.require("dijit.form.TextBox");
+               dojo.require("dijit.form.ValidationTextBox");
+               dojo.require("dijit.form.FilteringSelect");
+               dojo.require("dijit.form.CheckBox");
+               dojo.require("dijit.form.SimpleTextarea");
                dojo.require("dijit.Toolbar");
                dojo.require("dijit.ProgressBar");
                dojo.require("dijit.Menu");
+               dojo.require("dojo.parser");
 
                dojo.registerModulePath("fox", "../..");
 
@@ -322,15 +337,18 @@ function init_second_stage() {
 
                var toolbar = document.forms["main_toolbar_form"];
 
-               dropboxSelect(toolbar.view_mode, getInitParam("default_view_mode"));
-               dropboxSelect(toolbar.order_by, getInitParam("default_view_order_by"));
+               dijit.getEnclosingWidget(toolbar.view_mode).attr('value', 
+                       getInitParam("default_view_mode"));
+
+               dijit.getEnclosingWidget(toolbar.order_by).attr('value', 
+                       getInitParam("default_view_order_by"));
 
                feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
 
                loading_set_progress(30);
 
                if (has_local_storage())
-                       localStorage.clear();
+                       sessionStorage.clear();
 
                console.log("second stage ok");
 
@@ -339,12 +357,9 @@ function init_second_stage() {
        }
 }
 
-function quickMenuChange() {
-       var chooser = $("quickMenuChooser");
-       var opid = chooser[chooser.selectedIndex].value;
-
-       chooser.selectedIndex = 0;
-       quickMenuGo(opid);
+function quickMenuChange(elem) {
+       quickMenuGo(elem.value);
+       elem.attr('value', 'qmcDefault');
 }
 
 function quickMenuGo(opid) {
@@ -359,10 +374,7 @@ function quickMenuGo(opid) {
                }
 
                if (opid == "qmcSearch") {
-                       displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(), 
-                               function() { 
-                                       document.forms['search_form'].query.focus();
-                               });
+                       search();
                        return;
                }
        
@@ -372,7 +384,11 @@ function quickMenuGo(opid) {
                }
 
                if (opid == "qmcEditFeed") {
-                       editFeedDlg(getActiveFeedId());
+                       if (activeFeedIsCat())
+                               alert(__("You can't edit this kind of feed."));
+                       else
+                               editFeed(getActiveFeedId());
+                       return;
                }
        
                if (opid == "qmcRemoveFeed") {
@@ -410,16 +426,18 @@ function quickMenuGo(opid) {
                }
        
                if (opid == "qmcAddFilter") {
-                       displayDlg('quickAddFilter', '',
-                          function () {document.forms['filter_add_form'].reg_exp.focus();});
+                       quickAddFilter();
+                       return;
                }
 
                if (opid == "qmcAddLabel") {
                        addLabel();
+                       return;
                }
 
                if (opid == "qmcRescoreFeed") {
                        rescoreCurrentFeed();
+                       return;
                }
 
                if (opid == "qmcHKhelp") {
@@ -454,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");
@@ -494,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('');
        }
@@ -527,77 +545,6 @@ function catchupFeedInGroup(id) {
        }
 }
 
-function editFeedDlg(feed) {
-       try {
-
-               if (!feed) {
-                       alert(__("Please select some feed first."));
-                       return;
-               }
-       
-               if ((feed <= 0) || activeFeedIsCat()) {
-                       alert(__("You can't edit this kind of feed."));
-                       return;
-               }
-       
-               var query = "";
-       
-               if (feed > 0) {
-                       query = "?op=pref-feeds&subop=editfeed&id=" +   param_escape(feed);
-               } else {
-                       query = "?op=pref-labels&subop=edit&id=" +      param_escape(-feed-11);
-               }
-
-               disableHotkeys();
-
-               notify_progress("Loading, please wait...", true);
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               infobox_callback2(transport); 
-                               document.forms["edit_feed_form"].title.focus();
-                       } });
-
-       } catch (e) {
-               exception_error("editFeedDlg", e);
-       }
-}
-
-/* this functions duplicate those of prefs.js feed editor, with
-       some differences because there is no feedlist */
-
-function feedEditCancel() {
-       closeInfoBox();
-       return false;
-}
-
-function feedEditSave() {
-
-       try {
-       
-               // FIXME: add parameter validation
-
-               var query = Form.serialize("edit_feed_form");
-
-               notify_progress("Saving feed...");
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               dlg_frefresh_callback(transport); 
-                       } });
-
-               cache_flush();
-               closeInfoBox();
-
-               return false;
-
-       } catch (e) {
-               exception_error("feedEditSave (main)", e);
-       } 
-}
-
 function collapse_feedlist() {
        try {
 
@@ -680,9 +627,10 @@ function rescoreCurrentFeed() {
 }
 
 function hotkey_handler(e) {
-
        try {
 
+               if (e.target.nodeName == "INPUT" || e.target.nodeName == "TEXTAREA") return;
+
                var keycode;
                var shift_key = false;
 
@@ -710,17 +658,6 @@ function hotkey_handler(e) {
                        closeInfoBox();
                } 
 
-               var dialog = dijit.byId("infoBox");
-               var dialog_visible = false;
-
-               if (dialog)
-                       dialog_visible = Element.visible(dialog.domNode);
-
-               if (dialog_visible || !hotkeys_enabled) {
-                       console.log("hotkeys disabled");
-                       return;
-               }
-
                if (keycode == 16) return; // ignore lone shift
                if (keycode == 17) return; // ignore lone ctrl
 
@@ -760,10 +697,7 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 191 || keychar == '/') { // /
-                               displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(), 
-                                       function() { 
-                                               document.forms['search_form'].query.focus();
-                                       });
+                               search();
                                return false;
                        }
 
@@ -910,7 +844,13 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 69) { // e
-                               editFeedDlg(getActiveFeedId());
+
+                               if (activeFeedIsCat())
+                                       alert(__("You can't edit this kind of feed."));
+                               else
+                                       editFeed(getActiveFeedId());
+                               return;
+
                                return false;
                        }
 
@@ -950,8 +890,7 @@ function hotkey_handler(e) {
                        hotkey_prefix = false;
 
                        if (keycode == 70) { // f
-                               displayDlg('quickAddFilter', '',
-                                  function () {document.forms['filter_add_form'].reg_exp.focus();});
+                               quickAddFilter();
                                return false;
                        }
 
@@ -1098,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);
 
@@ -1158,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;
+}
+