X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=js%2Ffunctions.js;h=29dbe70cf80b0b9acb33beec4df935e0baf33231;hb=da1a3c2cc5621bccdb844cfbd03e377ada079fa9;hp=9028482f8f166fdac2746c694a30a89cdc0b8b65;hpb=424e28db6b706270c235a1ae089a880accbeb000;p=tt-rss.git diff --git a/js/functions.js b/js/functions.js index 9028482f..29dbe70c 100755 --- a/js/functions.js +++ b/js/functions.js @@ -1,8 +1,12 @@ -var loading_progress = 0; -var sanity_check_done = false; -var init_params = {}; -var _label_base_index = -1024; -var notify_hide_timerid = false; +/* global dijit, __ */ + +let init_params = {}; +let _label_base_index = -1024; +let loading_progress = 0; +let notify_hide_timerid = false; + +let hotkey_prefix = 0; +let hotkey_prefix_pressed = false; Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap( function (callOriginal, options) { @@ -22,6 +26,29 @@ Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap( } ); +/* xhr shorthand helpers */ + +function xhrPost(url, params, complete) { + console.log("xhrPost:", params); + return new Ajax.Request(url, { + parameters: params, + onComplete: complete + }); +} + +function xhrJson(url, params, complete) { + return xhrPost(url, params, (reply) => { + try { + const obj = JSON.parse(reply.responseText); + complete(obj); + } catch (e) { + console.error("xhrJson", e, reply); + complete(null); + } + + }) +} + /* add method to remove element from array */ Array.prototype.remove = function(s) { @@ -44,14 +71,14 @@ function exception_error(e, e_compat, filename, lineno, colno) { const msg = e.toString(); try { - new Ajax.Request("backend.php", { - parameters: {op: "rpc", method: "log", + xhrPost("backend.php", + {op: "rpc", method: "log", file: e.fileName ? e.fileName : filename, line: e.lineNumber ? e.lineNumber : lineno, msg: msg, context: e.stack}, - onComplete: function (transport) { + (transport) => { console.warn(transport.responseText); - } }); + }); } catch (e) { console.error("Exception while trying to log the error.", e); @@ -312,15 +339,12 @@ function displayDlg(title, id, param, callback) { notify_progress("Loading, please wait...", true); - const query = "?op=dlg&method=" + - param_escape(id) + "¶m=" + param_escape(param); + const query = { op: "dlg", method: id, param: param }; - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - infobox_callback2(transport, title); - if (callback) callback(transport); - } }); + xhrPost("backend.php", query, (transport) => { + infobox_callback2(transport, title); + if (callback) callback(transport); + }); return false; } @@ -459,12 +483,7 @@ function loading_set_progress(p) { } function remove_splash() { - - if (Element.visible("overlay")) { - console.log("about to remove splash, OMG!"); - Element.hide("overlay"); - console.log("removed splash!"); - } + Element.hide("overlay"); } function strip_tags(s) { @@ -482,9 +501,6 @@ function hotkey_prefix_timeout() { hotkey_prefix = false; Element.hide('cmdline'); } - - setTimeout(hotkey_prefix_timeout, 1000); - } function uploadIconHandler(rc) { @@ -508,22 +524,19 @@ function uploadIconHandler(rc) { function removeFeedIcon(id) { if (confirm(__("Remove stored feed icon?"))) { - const query = "backend.php?op=pref-feeds&method=removeicon&feed_id=" + param_escape(id); - - console.log(query); notify_progress("Removing feed icon...", true); - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - notify_info("Feed icon removed."); - if (inPreferences()) { - updateFeedList(); - } else { - setTimeout('updateFeedList(false, false)', 50); - } - } }); + const query = { op: "pref-feeds", method: "removeicon", feed_id: id }; + + xhrPost("backend.php", query, (transport) => { + notify_info("Feed icon removed."); + if (inPreferences()) { + updateFeedList(); + } else { + setTimeout('updateFeedList(false, false)', 50); + } + }); } return false; @@ -553,26 +566,22 @@ function addLabel(select, callback) { return false; } - let query = "?op=pref-labels&method=add&caption=" + - param_escape(caption); + const query = { op: "pref-labels", method: "add", caption: caption }; if (select) - query += "&output=select"; + Object.extend(query, {output: "select"}); notify_progress("Loading, please wait...", true); - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - if (callback) { - callback(transport); - } else if (inPreferences()) { - updateLabelList(); - } else { - updateFeedList(); - } - } }); - + xhrPost("backend.php", query, (transport) => { + if (callback) { + callback(transport); + } else if (inPreferences()) { + updateLabelList(); + } else { + updateFeedList(); + } + }); } } @@ -584,7 +593,7 @@ function quickAddFeed() { if (dijit.byId("batchSubDlg")) dijit.byId("batchSubDlg").destroyRecursive(); if (dijit.byId("feedAddDlg")) dijit.byId("feedAddDlg").destroyRecursive(); - var dialog = new dijit.Dialog({ + const dialog = new dijit.Dialog({ id: "feedAddDlg", title: __("Subscribe to Feed"), style: "width: 600px", @@ -606,82 +615,78 @@ function quickAddFeed() { Element.show("feed_add_spinner"); Element.hide("fadd_error_message"); - new Ajax.Request("backend.php", { - parameters: dojo.objectToQuery(this.attr('value')), - onComplete: function(transport) { - try { - - try { - var reply = JSON.parse(transport.responseText); - } catch (e) { - Element.hide("feed_add_spinner"); - alert(__("Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console.")); - console.log('quickAddFeed, backend returned:' + transport.responseText); - return; - } - - const rc = reply['result']; - - notify(''); - Element.hide("feed_add_spinner"); - - console.log(rc); - - switch (parseInt(rc['code'])) { - case 1: - dialog.hide(); - notify_info(__("Subscribed to %s").replace("%s", feed_url)); - - updateFeedList(); - break; - case 2: - dialog.show_error(__("Specified URL seems to be invalid.")); - break; - case 3: - dialog.show_error(__("Specified URL doesn't seem to contain any feeds.")); - break; - case 4: - var feeds = rc['feeds']; - - Element.show("fadd_multiple_notify"); - - var select = dijit.byId("feedDlg_feedContainerSelect"); - - while (select.getOptions().length > 0) - select.removeOption(0); - - select.addOption({value: '', label: __("Expand to select feed")}); - - var count = 0; - for (const feedUrl in feeds) { - select.addOption({value: feedUrl, label: feeds[feedUrl]}); - count++; - } - - Effect.Appear('feedDlg_feedsContainer', {duration : 0.5}); - - break; - case 5: - dialog.show_error(__("Couldn't download the specified URL: %s"). - replace("%s", rc['message'])); - break; - case 6: - dialog.show_error(__("XML validation failed: %s"). - replace("%s", rc['message'])); - break; - case 0: - dialog.show_error(__("You are already subscribed to this feed.")); - break; - } - - } catch (e) { - console.error(transport.responseText); - exception_error(e); - } - - } }); - - } + xhrPost("backend.php", this.attr('value'), (transport) => { + try { + + try { + var reply = JSON.parse(transport.responseText); + } catch (e) { + Element.hide("feed_add_spinner"); + alert(__("Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console.")); + console.log('quickAddFeed, backend returned:' + transport.responseText); + return; + } + + const rc = reply['result']; + + notify(''); + Element.hide("feed_add_spinner"); + + console.log(rc); + + switch (parseInt(rc['code'])) { + case 1: + dialog.hide(); + notify_info(__("Subscribed to %s").replace("%s", feed_url)); + + updateFeedList(); + break; + case 2: + dialog.show_error(__("Specified URL seems to be invalid.")); + break; + case 3: + dialog.show_error(__("Specified URL doesn't seem to contain any feeds.")); + break; + case 4: + const feeds = rc['feeds']; + + Element.show("fadd_multiple_notify"); + + const select = dijit.byId("feedDlg_feedContainerSelect"); + + while (select.getOptions().length > 0) + select.removeOption(0); + + select.addOption({value: '', label: __("Expand to select feed")}); + + let count = 0; + for (const feedUrl in feeds) { + select.addOption({value: feedUrl, label: feeds[feedUrl]}); + count++; + } + + Effect.Appear('feedDlg_feedsContainer', {duration : 0.5}); + + break; + case 5: + dialog.show_error(__("Couldn't download the specified URL: %s"). + replace("%s", rc['message'])); + break; + case 6: + dialog.show_error(__("XML validation failed: %s"). + replace("%s", rc['message'])); + break; + case 0: + dialog.show_error(__("You are already subscribed to this feed.")); + break; + } + + } catch (e) { + console.error(transport.responseText); + exception_error(e); + } + }); + } }, href: query}); @@ -693,43 +698,38 @@ function createNewRuleElement(parentNode, replaceNode) { //form.reg_exp.value = form.reg_exp.value.replace(/(<([^>]+)>)/ig,""); - const query = "backend.php?op=pref-filters&method=printrulename&rule="+ - param_escape(dojo.formToJson(form)); - - console.log(query); + const query = { op: "pref-filters", method: "printrulename", rule: dojo.formToJson(form) }; - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - try { - const li = dojo.create("li"); + xhrPost("backend.php", query, (transport) => { + try { + const li = dojo.create("li"); - const cb = dojo.create("input", { type: "checkbox" }, li); + const cb = dojo.create("input", { type: "checkbox" }, li); - new dijit.form.CheckBox({ - onChange: function() { - toggleSelectListRow2(this) }, - }, cb); + new dijit.form.CheckBox({ + onChange: function() { + toggleSelectListRow2(this) }, + }, cb); - dojo.create("input", { type: "hidden", - name: "rule[]", - value: dojo.formToJson(form) }, li); + dojo.create("input", { type: "hidden", + name: "rule[]", + value: dojo.formToJson(form) }, li); - dojo.create("span", { - onclick: function() { - dijit.byId('filterEditDlg').editRule(this); - }, - innerHTML: transport.responseText }, li); + dojo.create("span", { + onclick: function() { + dijit.byId('filterEditDlg').editRule(this); + }, + innerHTML: transport.responseText }, li); - if (replaceNode) { - parentNode.replaceChild(li, replaceNode); - } else { - parentNode.appendChild(li); - } - } catch (e) { - exception_error(e); + if (replaceNode) { + parentNode.replaceChild(li, replaceNode); + } else { + parentNode.appendChild(li); } - } }); + } catch (e) { + exception_error(e); + } + }); } function createNewActionElement(parentNode, replaceNode) { @@ -741,44 +741,40 @@ function createNewActionElement(parentNode, replaceNode) { form.action_param.value = form.action_param_plugin.value; } - const query = "backend.php?op=pref-filters&method=printactionname&action="+ - param_escape(dojo.formToJson(form)); - - console.log(query); - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - try { - const li = dojo.create("li"); + const query = { op: "pref-filters", method: "printactionname", + action: dojo.formToJson(form) }; - const cb = dojo.create("input", { type: "checkbox" }, li); + xhrPost("backend.php", query, (transport) => { + try { + const li = dojo.create("li"); - new dijit.form.CheckBox({ - onChange: function() { - toggleSelectListRow2(this) }, - }, cb); + const cb = dojo.create("input", { type: "checkbox" }, li); - dojo.create("input", { type: "hidden", - name: "action[]", - value: dojo.formToJson(form) }, li); + new dijit.form.CheckBox({ + onChange: function() { + toggleSelectListRow2(this) }, + }, cb); - dojo.create("span", { - onclick: function() { - dijit.byId('filterEditDlg').editAction(this); - }, - innerHTML: transport.responseText }, li); + dojo.create("input", { type: "hidden", + name: "action[]", + value: dojo.formToJson(form) }, li); - if (replaceNode) { - parentNode.replaceChild(li, replaceNode); - } else { - parentNode.appendChild(li); - } + dojo.create("span", { + onclick: function() { + dijit.byId('filterEditDlg').editAction(this); + }, + innerHTML: transport.responseText }, li); - } catch (e) { - exception_error(e); + if (replaceNode) { + parentNode.replaceChild(li, replaceNode); + } else { + parentNode.appendChild(li); } - } }); + + } catch (e) { + exception_error(e); + } + }); } @@ -839,72 +835,70 @@ function editFilterTest(query) { limit: 100, max_offset: 10000, getTestResults: function(query, offset) { - const updquery = query + "&offset=" + offset + "&limit=" + test_dlg.limit; - - console.log("getTestResults:" + offset); + const updquery = query + "&offset=" + offset + "&limit=" + test_dlg.limit; - new Ajax.Request("backend.php", { - parameters: updquery, - onComplete: function (transport) { - try { - const result = JSON.parse(transport.responseText); + console.log("getTestResults:" + offset); - if (result && dijit.byId("filterTestDlg") && dijit.byId("filterTestDlg").open) { - test_dlg.results += result.size(); + xhrPost("backend.php", updquery, (transport) => { + try { + const result = JSON.parse(transport.responseText); - console.log("got results:" + result.size()); + if (result && dijit.byId("filterTestDlg") && dijit.byId("filterTestDlg").open) { + test_dlg.results += result.length; - $("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...") - .replace("%f", test_dlg.results) - .replace("%d", offset); + console.log("got results:" + result.length); - console.log(offset + " " + test_dlg.max_offset); + $("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...") + .replace("%f", test_dlg.results) + .replace("%d", offset); - for (let i = 0; i < result.size(); i++) { - const tmp = new Element("table"); - tmp.innerHTML = result[i]; - dojo.parser.parse(tmp); + console.log(offset + " " + test_dlg.max_offset); - $("prefFilterTestResultList").innerHTML += tmp.innerHTML; - } + for (let i = 0; i < result.length; i++) { + const tmp = new Element("table"); + tmp.innerHTML = result[i]; + dojo.parser.parse(tmp); - if (test_dlg.results < 30 && offset < test_dlg.max_offset) { + $("prefFilterTestResultList").innerHTML += tmp.innerHTML; + } - // get the next batch - window.setTimeout(function () { - test_dlg.getTestResults(query, offset + test_dlg.limit); - }, 0); + if (test_dlg.results < 30 && offset < test_dlg.max_offset) { - } else { - // all done + // get the next batch + window.setTimeout(function () { + test_dlg.getTestResults(query, offset + test_dlg.limit); + }, 0); - Element.hide("prefFilterLoadingIndicator"); + } else { + // all done - if (test_dlg.results == 0) { - $("prefFilterTestResultList").innerHTML = "