X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=js%2Ffunctions.js;h=6a895fc50ad08719fce96ee73a4dc805982c35c6;hb=02ec3984bd18f8a1c55dec448d1d401e3e5a1880;hp=7fbb4e75d59641ab0c83df45c5f63b2617ee3a1a;hpb=0d27227359df5597d4dc3b646eaa63082f42e4f0;p=tt-rss.git diff --git a/js/functions.js b/js/functions.js index 7fbb4e75..6a895fc5 100755 --- a/js/functions.js +++ b/js/functions.js @@ -5,6 +5,9 @@ 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) { @@ -27,23 +30,23 @@ Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap( function xhrPost(url, params, complete) { console.log("xhrPost:", params); - new Ajax.Request(url, { - parameters: params, - onComplete: complete - }); + return new Ajax.Request(url, { + parameters: params, + onComplete: complete + }); } function xhrJson(url, params, complete) { - xhrPost(url, params, (reply) => { - try { - const obj = JSON.parse(reply.responseText); - complete(obj); - } catch (e) { - console.error("xhrJson", e, reply); - complete(null); - } - - }) + 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 */ @@ -243,15 +246,15 @@ function getCookie(name) { const prefix = name + "="; let begin = dc.indexOf("; " + prefix); if (begin == -1) { - begin = dc.indexOf(prefix); - if (begin != 0) return null; + begin = dc.indexOf(prefix); + if (begin != 0) return null; } else { - begin += 2; + begin += 2; } let end = document.cookie.indexOf(";", begin); if (end == -1) { - end = dc.length; + end = dc.length; } return unescape(dc.substring(begin + prefix.length, end)); } @@ -336,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; } @@ -501,9 +501,6 @@ function hotkey_prefix_timeout() { hotkey_prefix = false; Element.hide('cmdline'); } - - setTimeout(hotkey_prefix_timeout, 1000); - } function uploadIconHandler(rc) { @@ -527,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; @@ -572,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(); + } + }); } } @@ -625,28 +615,26 @@ 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 { + 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; - } + 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']; + const rc = reply['result']; - notify(''); - Element.hide("feed_add_spinner"); + notify(''); + Element.hide("feed_add_spinner"); - console.log(rc); + console.log(rc); - switch (parseInt(rc['code'])) { + switch (parseInt(rc['code'])) { case 1: dialog.hide(); notify_info(__("Subscribed to %s").replace("%s", feed_url)); @@ -660,18 +648,18 @@ function quickAddFeed() { dialog.show_error(__("Specified URL doesn't seem to contain any feeds.")); break; case 4: - var feeds = rc['feeds']; + const feeds = rc['feeds']; Element.show("fadd_multiple_notify"); - var select = dijit.byId("feedDlg_feedContainerSelect"); + const select = dijit.byId("feedDlg_feedContainerSelect"); while (select.getOptions().length > 0) select.removeOption(0); select.addOption({value: '', label: __("Expand to select feed")}); - var count = 0; + let count = 0; for (const feedUrl in feeds) { select.addOption({value: feedUrl, label: feeds[feedUrl]}); count++; @@ -682,25 +670,23 @@ function quickAddFeed() { break; case 5: dialog.show_error(__("Couldn't download the specified URL: %s"). - replace("%s", rc['message'])); + replace("%s", rc['message'])); break; case 6: dialog.show_error(__("XML validation failed: %s"). - replace("%s", rc['message'])); + 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); } - } }); - - } + } catch (e) { + console.error(transport.responseText); + exception_error(e); + } + }); + } }, href: query}); @@ -712,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) { @@ -760,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)); + const query = { op: "pref-filters", method: "printactionname", + action: dojo.formToJson(form) }; - console.log(query); - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - try { - const li = dojo.create("li"); - - 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); + } + }); } @@ -858,72 +835,70 @@ function editFilterTest(query) { limit: 100, max_offset: 10000, getTestResults: function(query, offset) { - const updquery = query + "&offset=" + offset + "&limit=" + test_dlg.limit; + const updquery = query + "&offset=" + offset + "&limit=" + test_dlg.limit; - console.log("getTestResults:" + offset); + console.log("getTestResults:" + offset); - new Ajax.Request("backend.php", { - parameters: updquery, - onComplete: function (transport) { - try { - const result = JSON.parse(transport.responseText); - - if (result && dijit.byId("filterTestDlg") && dijit.byId("filterTestDlg").open) { - test_dlg.results += result.length; + xhrPost("backend.php", updquery, (transport) => { + try { + const result = JSON.parse(transport.responseText); - console.log("got results:" + result.length); + 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.length; 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 = "
this -> "
", 'ENT_NOQUOTES'); - // * returns 1: 'this -> "
' - // * example 2: htmlspecialchars_decode("""); - // * returns 2: '"' - let optTemp = 0, - i = 0, - noquotes = false; - if (typeof quote_style === 'undefined') { - quote_style = 2; - } - string = string.toString().replace(/</g, '<').replace(/>/g, '>'); - const OPTS = { - 'ENT_NOQUOTES': 0, - 'ENT_HTML_QUOTE_SINGLE': 1, - 'ENT_HTML_QUOTE_DOUBLE': 2, - 'ENT_COMPAT': 2, - 'ENT_QUOTES': 3, - 'ENT_IGNORE': 4 - }; - if (quote_style === 0) { - noquotes = true; - } - if (typeof quote_style !== 'number') { // Allow for a single string or an array of string flags - quote_style = [].concat(quote_style); - for (i = 0; i < quote_style.length; i++) { - // Resolve string input to bitwise e.g. 'PATHINFO_EXTENSION' becomes 4 - if (OPTS[quote_style[i]] === 0) { - noquotes = true; - } else if (OPTS[quote_style[i]]) { - optTemp = optTemp | OPTS[quote_style[i]]; - } - } - quote_style = optTemp; - } - if (quote_style & OPTS.ENT_HTML_QUOTE_SINGLE) { - string = string.replace(/*39;/g, "'"); // PHP doesn't currently escape if more than one 0, but it should - // string = string.replace(/'|*27;/g, "'"); // This would also be useful here, but not a part of PHP - } - if (!noquotes) { - string = string.replace(/"/g, '"'); - } - // Put this in last place to avoid escape being double-decoded - string = string.replace(/&/g, '&'); - - return string; -} - - function label_to_feed_id(label) { return _label_base_index - 1 - Math.abs(label); } @@ -1605,3 +1484,58 @@ function openArticlePopup(id) { w.opener = null; w.location = "backend.php?op=article&method=view&mode=raw&html=1&zoom=1&id=" + id + "&csrf_token=" + getInitParam("csrf_token"); } + +function keyevent_to_action(e) { + + const hotkeys_map = getInitParam("hotkeys"); + const keycode = e.which; + const keychar = String.fromCharCode(keycode).toLowerCase(); + + if (keycode == 27) { // escape and drop prefix + hotkey_prefix = false; + } + + if (keycode == 16 || keycode == 17) return; // ignore lone shift / ctrl + + if (!hotkey_prefix && hotkeys_map[0].indexOf(keychar) != -1) { + + const date = new Date(); + const ts = Math.round(date.getTime() / 1000); + + hotkey_prefix = keychar; + hotkey_prefix_pressed = ts; + + $("cmdline").innerHTML = keychar; + Element.show("cmdline"); + + e.stopPropagation(); + + return false; + } + + Element.hide("cmdline"); + + let hotkey_name = keychar.search(/[a-zA-Z0-9]/) != -1 ? keychar : "(" + keycode + ")"; + + // ensure ^*char notation + if (e.shiftKey) hotkey_name = "*" + hotkey_name; + if (e.ctrlKey) hotkey_name = "^" + hotkey_name; + if (e.altKey) hotkey_name = "+" + hotkey_name; + if (e.metaKey) hotkey_name = "%" + hotkey_name; + + const hotkey_full = hotkey_prefix ? hotkey_prefix + " " + hotkey_name : hotkey_name; + hotkey_prefix = false; + + let action_name = false; + + for (const sequence in hotkeys_map[1]) { + if (sequence == hotkey_full) { + action_name = hotkeys_map[1][sequence]; + break; + } + } + + console.log('keyevent_to_action', hotkey_full, '=>', action_name); + + return action_name; +} \ No newline at end of file