]> git.wh0rd.org - tt-rss.git/blobdiff - js/tt-rss.js
use xhrPost in more places
[tt-rss.git] / js / tt-rss.js
index 872407e7391e111446f9347cd7c514e8013441bd..e25dff18ecf34b38f7d7bc8aee180fe5f33b45f7 100644 (file)
@@ -1,11 +1,13 @@
-var global_unread = -1;
-var hotkey_prefix = false;
-var hotkey_prefix_pressed = false;
-var hotkey_actions = {};
-var _widescreen_mode = false;
-var _rpc_seq = 0;
-var _active_feed_id = 0;
-var _active_feed_is_cat = false;
+/* global dijit, __ */
+
+let global_unread = -1;
+let hotkey_prefix = false;
+let hotkey_prefix_pressed = false;
+let hotkey_actions = {};
+let _widescreen_mode = false;
+let _rpc_seq = 0;
+let _active_feed_id = 0;
+let _active_feed_is_cat = false;
 
 function next_seq() {
        _rpc_seq += 1;
@@ -17,7 +19,7 @@ function get_seq() {
 }
 
 function activeFeedIsCat() {
-       return _active_feed_is_cat;
+       return !!_active_feed_is_cat;
 }
 
 function getActiveFeedId() {
@@ -79,14 +81,6 @@ function updateFeedList() {
                        id: "feedTree",
                }, "feedTree");
 
-               /*              var menu = new dijit.Menu({id: 'feedMenu'});
-
-                menu.addChild(new dijit.MenuItem({
-                label: "Simple menu item"
-                }));
-
-                //             menu.bindDomNode(tree.domNode); */
-
                var tmph = dojo.connect(dijit.byId('feedMenu'), '_openMyself', function (event) {
                        console.log(dijit.getEnclosingWidget(event.target));
                        dojo.disconnect(tmph);
@@ -119,18 +113,12 @@ function catchupAllFeeds() {
 
        if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
 
-               const query_str = "backend.php?op=feeds&method=catchupAll";
-
                notify_progress("Marking all feeds as read...");
 
-               //console.log("catchupAllFeeds Q=" + query_str);
-
-               new Ajax.Request("backend.php", {
-                       parameters: query_str,
-                       onComplete: function(transport) {
-                               request_counters(true);
-                               viewCurrentFeed();
-                       } });
+               xhrPost("backend.php", {op: "feeds", method: "catchupAll"}, () => {
+                       request_counters(true);
+                       viewCurrentFeed();
+               });
 
                global_unread = 0;
                updateTitle("");
@@ -166,7 +154,7 @@ function search() {
                style: "width: 600px",
                execute: function() {
                        if (this.validate()) {
-                               _search_query = dojo.objectToQuery(this.attr('value'));
+                               _search_query = this.attr('value');
                                this.hide();
                                viewCurrentFeed();
                        }
@@ -259,17 +247,21 @@ function init() {
 
                                        init_hotkey_actions();
 
-                                       new Ajax.Request("backend.php", {
-                                               parameters: {
-                                                       op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
-                                                       hasMp3: hasMp3,
-                                                       clientTzOffset: clientTzOffset,
-                                                       hasSandbox: hasSandbox
-                                               },
-                                               onComplete: function (transport) {
-                                                       backend_sanity_check_callback(transport);
-                                               }
+                                       const params = {
+                            op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
+                            hasMp3: hasMp3,
+                            clientTzOffset: clientTzOffset,
+                            hasSandbox: hasSandbox
+                        };
+
+                                       xhrPost("backend.php", params, (transport) => {
+                        try {
+                            backend_sanity_check_callback(transport);
+                        } catch (e) {
+                            console.error(e);
+                        }
                                        });
+
                                } catch (e) {
                                        exception_error(e);
                                }
@@ -449,14 +441,9 @@ function init_hotkey_actions() {
                reverseHeadlineOrder();
        };
        hotkey_actions["feed_toggle_vgroup"] = function() {
-               const query_str = "?op=rpc&method=togglepref&key=VFEED_GROUP_BY_FEED";
-
-               new Ajax.Request("backend.php", {
-                       parameters: query_str,
-                       onComplete: function(transport) {
-                               viewCurrentFeed();
-                       } });
-
+               xhrPost("backend.php", {op: "rpc", method: "togglepref", key: "VFEED_GROUP_BY_FEED"}, () => {
+                       viewCurrentFeed();
+               })
        };
        hotkey_actions["catchup_all"] = function() {
                catchupAllFeeds();
@@ -539,31 +526,24 @@ function init_hotkey_actions() {
                notify_progress("Loading, please wait...");
 
                const value = isCdmMode() ? "false" : "true";
-               const query = "?op=rpc&method=setpref&key=COMBINED_DISPLAY_MODE&value=" + value;
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               setInitParam("combined_display_mode",
-                                       !getInitParam("combined_display_mode"));
+               xhrPost("backend.php", {op: "rpc", method: "setpref", key: "COMBINED_DISPLAY_MODE", value: value}, () => {
+            setInitParam("combined_display_mode",
+                !getInitParam("combined_display_mode"));
 
-                               closeArticlePanel();
-                               viewCurrentFeed();
-
-                       } });
+            closeArticlePanel();
+            viewCurrentFeed();
+               })
        };
        hotkey_actions["toggle_cdm_expanded"] = function() {
                notify_progress("Loading, please wait...");
 
-               const value = getInitParam("cdm_expanded") ? "false" : "true";
-               const query = "?op=rpc&method=setpref&key=CDM_EXPANDED&value=" + value;
+        const value = getInitParam("cdm_expanded") ? "false" : "true";
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               setInitParam("cdm_expanded", !getInitParam("cdm_expanded"));
-                               viewCurrentFeed();
-                       } });
+               xhrPost("backend.php", {op: "rpc", method: "setpref", key: "CDM_EXPANDED", value: value}, () => {
+            setInitParam("cdm_expanded", !getInitParam("cdm_expanded"));
+            viewCurrentFeed();
+        });
        };
 }
 
@@ -603,8 +583,6 @@ function init_second_stage() {
        dijit.getEnclosingWidget(toolbar.order_by).attr('value',
                getInitParam("default_view_order_by"));
 
-       const feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
-
        const hash_feed_id = hash_get('f');
        const hash_feed_is_cat = hash_get('c') == "1";
 
@@ -693,15 +671,6 @@ function quickMenuGo(opid) {
        case "qmcShowOnlyUnread":
                toggleDispRead();
                break;
-       case "qmcAddFilter":
-               quickAddFilter();
-               break;
-       case "qmcAddLabel":
-               addLabel();
-               break;
-       case "qmcRescoreFeed":
-               rescoreCurrentFeed();
-               break;
        case "qmcToggleWidescreen":
                if (!isCdmMode()) {
                        _widescreen_mode = !_widescreen_mode;
@@ -727,18 +696,10 @@ function toggleDispRead() {
 
        const hide = !(getInitParam("hide_read_feeds") == "1");
 
-       hideOrShowFeeds(hide);
-
-       const query = "?op=rpc&method=setpref&key=HIDE_READ_FEEDS&value=" +
-               param_escape(hide);
-
-       setInitParam("hide_read_feeds", hide);
-
-       new Ajax.Request("backend.php", {
-               parameters: query,
-               onComplete: function(transport) {
-               } });
-
+       xhrPost("backend.php", {op: "rpc", method: "setpref", key: "HIDE_READ_FEEDS", value: hide}, () => {
+        hideOrShowFeeds(hide);
+        setInitParam("hide_read_feeds", hide);
+       });
 }
 
 function parse_runtime_info(data) {
@@ -805,58 +766,19 @@ function viewModeChanged() {
        return viewCurrentFeed('');
 }
 
-function rescoreCurrentFeed() {
-
-       const actid = getActiveFeedId();
-
-       if (activeFeedIsCat() || actid < 0) {
-               alert(__("You can't rescore this kind of feed."));
-               return;
-       }
-
-       if (!actid) {
-               alert(__("Please select some feed first."));
-               return;
-       }
-
-       const fn = getFeedName(actid);
-       const pr = __("Rescore articles in %s?").replace("%s", fn);
-
-       if (confirm(pr)) {
-               notify_progress("Rescoring articles...");
-
-               const query = "?op=pref-feeds&method=rescore&quiet=1&ids=" + actid;
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               viewCurrentFeed();
-                       } });
-       }
-}
-
 function hotkey_handler(e) {
 
        if (e.target.nodeName == "INPUT" || e.target.nodeName == "TEXTAREA") return;
 
-       let keycode = false;
+       let keycode = e.which;
 
-       const cmdline = $('cmdline');
-
-       if (window.event) {
-               keycode = window.event.keyCode;
-       } else if (e) {
-               keycode = e.which;
-       }
-
-       if (keycode == 27) { // escape
+       if (keycode == 27) { // escape and drop prefix
                hotkey_prefix = false;
        }
 
-       if (keycode == 16) return; // ignore lone shift
-       if (keycode == 17) return; // ignore lone ctrl
+       if (keycode == 16 || keycode == 17) return; // ignore lone shift / ctrl
 
-       var hotkeys = getInitParam("hotkeys");
+       const hotkeys = getInitParam("hotkeys");
        const keychar = String.fromCharCode(keycode).toLowerCase();
 
        if (!hotkey_prefix && hotkeys[0].indexOf(keychar) != -1) {
@@ -867,8 +789,8 @@ function hotkey_handler(e) {
                hotkey_prefix = keychar;
                hotkey_prefix_pressed = ts;
 
-               cmdline.innerHTML = keychar;
-               Element.show(cmdline);
+               $("cmdline").innerHTML = keychar;
+               Element.show("cmdline");
 
                e.stopPropagation();
 
@@ -876,7 +798,7 @@ function hotkey_handler(e) {
                return true;
        }
 
-       Element.hide(cmdline);
+       Element.hide("cmdline");
 
        let hotkey = keychar.search(/[a-zA-Z0-9]/) != -1 ? keychar : "(" + keycode + ")";
 
@@ -890,7 +812,6 @@ function hotkey_handler(e) {
        hotkey_prefix = false;
 
        let hotkey_action = false;
-       var hotkeys = getInitParam("hotkeys");
 
        for (const sequence in hotkeys[1]) {
                if (sequence == hotkey) {
@@ -958,22 +879,18 @@ function handle_rpc_json(transport, scheduled_call) {
 
                        const seq = reply['seq'];
 
-                       if (seq) {
-                               if (get_seq() != seq) {
-                                       console.log("[handle_rpc_json] sequence mismatch: " + seq +
-                                               " (want: " + get_seq() + ")");
-                                       return true;
-                               }
+                       if (seq && get_seq() != seq) {
+                               console.log("[handle_rpc_json] sequence mismatch: " + seq +
+                                       " (want: " + get_seq() + ")");
+                               return true;
                        }
 
                        const message = reply['message'];
 
-                       if (message) {
-                               if (message == "UPDATE_COUNTERS") {
-                                       console.log("need to refresh counters...");
-                                       setInitParam("last_article_id", -1);
-                                       request_counters(true);
-                               }
+                       if (message == "UPDATE_COUNTERS") {
+                               console.log("need to refresh counters...");
+                               setInitParam("last_article_id", -1);
+                               request_counters(true);
                        }
 
                        const counters = reply['counters'];
@@ -988,10 +905,14 @@ function handle_rpc_json(transport, scheduled_call) {
 
                        if (netalert) netalert.hide();
 
-               } else if (netalert)
-                               netalert.show();
-                       else
-                               notify_error("Communication problem with server.");
+                       return reply;
+
+               } else {
+            if (netalert)
+                netalert.show();
+            else
+                notify_error("Communication problem with server.");
+        }
 
        } catch (e) {
                if (netalert)
@@ -1002,7 +923,7 @@ function handle_rpc_json(transport, scheduled_call) {
                console.error(e);
        }
 
-       return true;
+       return false;
 }
 
 function switchPanelMode(wide) {
@@ -1048,22 +969,16 @@ function switchPanelMode(wide) {
 
        if (article_id) view(article_id);
 
-       new Ajax.Request("backend.php", {
-               parameters: "op=rpc&method=setpanelmode&wide=" + (wide ? 1 : 0),
-               onComplete: function(transport) {
-                       console.log(transport.responseText);
-               } });
+       xhrPost("backend.php", {op: "rpc", method: "setpanelmode", wide: wide ? 1 : 0});
 }
 
 function update_random_feed() {
        console.log("in update_random_feed");
 
-       new Ajax.Request("backend.php", {
-               parameters: "op=rpc&method=updateRandomFeed",
-               onComplete: function(transport) {
-                       handle_rpc_json(transport, true);
-                       window.setTimeout(update_random_feed, 30*1000);
-               } });
+       xhrPost("backend.php", { op: "rpc", method: "updateRandomFeed" }, (transport) => {
+               handle_rpc_json(transport, true);
+               window.setTimeout(update_random_feed, 30*1000);
+       });
 }
 
 function hash_get(key) {