X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=js%2Ffunctions.js;h=7fbb4e75d59641ab0c83df45c5f63b2617ee3a1a;hb=0d27227359df5597d4dc3b646eaa63082f42e4f0;hp=d52fee8944a53bb150bbc9118a6a6adc6a1c77f5;hpb=4ee398a41e2176d4a5c997920db35cb6bed12f2e;p=tt-rss.git diff --git a/js/functions.js b/js/functions.js index d52fee89..7fbb4e75 100755 --- a/js/functions.js +++ b/js/functions.js @@ -1,8 +1,9 @@ -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; Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap( function (callOriginal, options) { @@ -22,15 +23,37 @@ Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap( } ); +/* xhr shorthand helpers */ + +function xhrPost(url, params, complete) { + console.log("xhrPost:", params); + 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); + } + + }) +} + /* add method to remove element from array */ Array.prototype.remove = function(s) { - for (var i=0; i < this.length; i++) { + for (let i=0; i < this.length; i++) { if (s == this[i]) this.splice(i, 1); } }; - function report_error(message, filename, lineno, colno, error) { exception_error(error, null, filename, lineno); } @@ -42,23 +65,23 @@ function exception_error(e, e_compat, filename, lineno, colno) { try { console.error(e); - var msg = e.toString(); + 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); } - var content = "

" + msg + "

"; + let content = "

" + msg + "

"; if (e.stack) { content += "
Stack trace:
" + @@ -77,7 +100,7 @@ function exception_error(e, e_compat, filename, lineno, colno) { if (dijit.byId("exceptionDlg")) dijit.byId("exceptionDlg").destroyRecursive(); - var dialog = new dijit.Dialog({ + const dialog = new dijit.Dialog({ id: "exceptionDlg", title: "Unhandled exception", style: "width: 600px", @@ -96,22 +119,12 @@ function exception_error(e, e_compat, filename, lineno, colno) { } function param_escape(arg) { - if (typeof encodeURIComponent != 'undefined') - return encodeURIComponent(arg); - else - return escape(arg); -} - -function param_unescape(arg) { - if (typeof decodeURIComponent != 'undefined') - return decodeURIComponent(arg); - else - return unescape(arg); + return encodeURIComponent(arg); } function notify_real(msg, no_hide, n_type) { - var n = $("notify"); + const n = $("notify"); if (!n) return; @@ -193,7 +206,7 @@ function notify_info(msg, no_hide) { function setCookie(name, value, lifetime, path, domain, secure) { - var d = false; + let d = false; if (lifetime) { d = new Date(); @@ -226,9 +239,9 @@ function delCookie(name, path, domain) { function getCookie(name) { - var dc = document.cookie; - var prefix = name + "="; - var begin = dc.indexOf("; " + prefix); + const dc = document.cookie; + const prefix = name + "="; + let begin = dc.indexOf("; " + prefix); if (begin == -1) { begin = dc.indexOf(prefix); if (begin != 0) return null; @@ -236,7 +249,7 @@ function getCookie(name) { else { begin += 2; } - var end = document.cookie.indexOf(";", begin); + let end = document.cookie.indexOf(";", begin); if (end == -1) { end = dc.length; } @@ -255,53 +268,14 @@ function gotoMain() { document.location.href = "index.php"; } -/** * @(#)isNumeric.js * * Copyright (c) 2000 by Sundar Dorai-Raj - * * @author Sundar Dorai-Raj - * * Email: sdoraira@vt.edu - * * This program is free software; you can redistribute it and/or - * * modify it under the terms of the GNU General Public License - * * as published by the Free Software Foundation; either version 2 - * * of the License, or (at your option) any later version, - * * provided that any use properly credits the author. - * * This program is distributed in the hope that it will be useful, - * * but WITHOUT ANY WARRANTY; without even the implied warranty of - * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * * GNU General Public License for more details at http://www.gnu.org * * */ - - var numbers=".0123456789"; - function isNumeric(x) { - // is x a String or a character? - if(x.length>1) { - // remove negative sign - x=Math.abs(x)+""; - for(var j=0;j=0) return true; - return false; - } - } - - function toggleSelectRowById(sender, id) { - var row = $(id); - return toggleSelectRow(sender, row); -} - -function toggleSelectListRow(sender) { - var row = sender.parentNode; + const row = $(id); return toggleSelectRow(sender, row); } /* this is for dijit Checkbox */ function toggleSelectListRow2(sender) { - var row = sender.domNode.parentNode; + const row = sender.domNode.parentNode; return toggleSelectRow(sender, row); } @@ -345,21 +319,12 @@ function checkboxToggleElement(elem, id) { } } -function dropboxSelect(e, v) { - for (var i = 0; i < e.length; i++) { - if (e[i].value == v) { - e.selectedIndex = i; - break; - } - } -} - function getURLParam(param){ return String(window.location.href).parseQuery()[param]; } -function closeInfoBox(cleanup) { - dialog = dijit.byId("infoBox"); +function closeInfoBox() { + const dialog = dijit.byId("infoBox"); if (dialog) dialog.hide(); @@ -371,7 +336,7 @@ function displayDlg(title, id, param, callback) { notify_progress("Loading, please wait...", true); - var query = "?op=dlg&method=" + + const query = "?op=dlg&method=" + param_escape(id) + "¶m=" + param_escape(param); new Ajax.Request("backend.php", { @@ -385,7 +350,7 @@ function displayDlg(title, id, param, callback) { } function infobox_callback2(transport, title) { - var dialog = false; + let dialog = false; if (dijit.byId("infoBox")) { dialog = dijit.byId("infoBox"); @@ -394,7 +359,7 @@ function infobox_callback2(transport, title) { //console.log("infobox_callback2"); notify(''); - var content = transport.responseText; + const content = transport.responseText; if (!dialog) { dialog = new dijit.Dialog({ @@ -448,7 +413,7 @@ function fatalError(code, msg, ext_info) { msg = ERRORS[code]; } - var content = "
Error code: " + code + "
" + + let content = "
Error code: " + code + "
" + "

" + msg + "

"; if (ext_info) { @@ -457,7 +422,7 @@ function fatalError(code, msg, ext_info) { ext_info + ""; } - var dialog = new dijit.Dialog({ + const dialog = new dijit.Dialog({ title: "Fatal error", style: "width: 600px", content: content}); @@ -471,9 +436,9 @@ function fatalError(code, msg, ext_info) { } function filterDlgCheckAction(sender) { - var action = sender.value; + const action = sender.value; - var action_param = $("filterDlg_paramBox"); + const action_param = $("filterDlg_paramBox"); if (!action_param) { console.log("filterDlgCheckAction: can't find action param box!"); @@ -518,29 +483,17 @@ 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) { return s.replace(/<\/?[^>]+(>|$)/g, ""); } -function truncate_string(s, length) { - if (!length) length = 30; - var tmp = s.substring(0, length); - if (s.length > length) tmp += "…"; - return tmp; -} - function hotkey_prefix_timeout() { - var date = new Date(); - var ts = Math.round(date.getTime() / 1000); + const date = new Date(); + const ts = Math.round(date.getTime() / 1000); if (hotkey_prefix_pressed && ts - hotkey_prefix_pressed >= 5) { console.log("hotkey_prefix seems to be stuck, aborting"); @@ -574,7 +527,7 @@ function uploadIconHandler(rc) { function removeFeedIcon(id) { if (confirm(__("Remove stored feed icon?"))) { - var query = "backend.php?op=pref-feeds&method=removeicon&feed_id=" + param_escape(id); + const query = "backend.php?op=pref-feeds&method=removeicon&feed_id=" + param_escape(id); console.log(query); @@ -596,23 +549,21 @@ function removeFeedIcon(id) { } function uploadFeedIcon() { - var file = $("icon_file"); + const file = $("icon_file"); if (file.value.length == 0) { alert(__("Please select an image file to upload.")); - } else { - if (confirm(__("Upload new icon for this feed?"))) { + } else if (confirm(__("Upload new icon for this feed?"))) { notify_progress("Uploading, please wait...", true); return true; } - } return false; } function addLabel(select, callback) { - var caption = prompt(__("Please enter label caption:"), ""); + const caption = prompt(__("Please enter label caption:"), ""); if (caption != undefined) { @@ -621,7 +572,7 @@ function addLabel(select, callback) { return false; } - var query = "?op=pref-labels&method=add&caption=" + + let query = "?op=pref-labels&method=add&caption=" + param_escape(caption); if (select) @@ -629,8 +580,6 @@ function addLabel(select, callback) { notify_progress("Loading, please wait...", true); - if (inPreferences() && !select) active_tab = "labelConfig"; - new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { @@ -648,18 +597,18 @@ function addLabel(select, callback) { } function quickAddFeed() { - var query = "backend.php?op=feeds&method=quickAddFeed"; + const query = "backend.php?op=feeds&method=quickAddFeed"; // overlapping widgets 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", show_error: function(msg) { - var elem = $("fadd_error_message"); + const elem = $("fadd_error_message"); elem.innerHTML = msg; @@ -671,7 +620,7 @@ function quickAddFeed() { if (this.validate()) { console.log(dojo.objectToQuery(this.attr('value'))); - var feed_url = this.attr('value').feed; + const feed_url = this.attr('value').feed; Element.show("feed_add_spinner"); Element.hide("fadd_error_message"); @@ -690,7 +639,7 @@ function quickAddFeed() { return; } - var rc = reply['result']; + const rc = reply['result']; notify(''); Element.hide("feed_add_spinner"); @@ -711,7 +660,7 @@ function quickAddFeed() { dialog.show_error(__("Specified URL doesn't seem to contain any feeds.")); break; case 4: - feeds = rc['feeds']; + var feeds = rc['feeds']; Element.show("fadd_multiple_notify"); @@ -723,7 +672,7 @@ function quickAddFeed() { select.addOption({value: '', label: __("Expand to select feed")}); var count = 0; - for (var feedUrl in feeds) { + for (const feedUrl in feeds) { select.addOption({value: feedUrl, label: feeds[feedUrl]}); count++; } @@ -739,7 +688,6 @@ function quickAddFeed() { dialog.show_error(__("XML validation failed: %s"). replace("%s", rc['message'])); break; - break; case 0: dialog.show_error(__("You are already subscribed to this feed.")); break; @@ -760,11 +708,11 @@ function quickAddFeed() { } function createNewRuleElement(parentNode, replaceNode) { - var form = document.forms["filter_new_rule_form"]; + const form = document.forms["filter_new_rule_form"]; //form.reg_exp.value = form.reg_exp.value.replace(/(<([^>]+)>)/ig,""); - var query = "backend.php?op=pref-filters&method=printrulename&rule="+ + const query = "backend.php?op=pref-filters&method=printrulename&rule="+ param_escape(dojo.formToJson(form)); console.log(query); @@ -773,9 +721,9 @@ function createNewRuleElement(parentNode, replaceNode) { parameters: query, onComplete: function (transport) { try { - var li = dojo.create("li"); + const li = dojo.create("li"); - var cb = dojo.create("input", { type: "checkbox" }, li); + const cb = dojo.create("input", { type: "checkbox" }, li); new dijit.form.CheckBox({ onChange: function() { @@ -804,7 +752,7 @@ function createNewRuleElement(parentNode, replaceNode) { } function createNewActionElement(parentNode, replaceNode) { - var form = document.forms["filter_new_action_form"]; + const form = document.forms["filter_new_action_form"]; if (form.action_id.value == 7) { form.action_param.value = form.action_param_label.value; @@ -812,7 +760,7 @@ function createNewActionElement(parentNode, replaceNode) { form.action_param.value = form.action_param_plugin.value; } - var query = "backend.php?op=pref-filters&method=printactionname&action="+ + const query = "backend.php?op=pref-filters&method=printactionname&action="+ param_escape(dojo.formToJson(form)); console.log(query); @@ -821,9 +769,9 @@ function createNewActionElement(parentNode, replaceNode) { parameters: query, onComplete: function (transport) { try { - var li = dojo.create("li"); + const li = dojo.create("li"); - var cb = dojo.create("input", { type: "checkbox" }, li); + const cb = dojo.create("input", { type: "checkbox" }, li); new dijit.form.CheckBox({ onChange: function() { @@ -857,10 +805,10 @@ function addFilterRule(replaceNode, ruleStr) { if (dijit.byId("filterNewRuleDlg")) dijit.byId("filterNewRuleDlg").destroyRecursive(); - var query = "backend.php?op=pref-filters&method=newrule&rule=" + + const query = "backend.php?op=pref-filters&method=newrule&rule=" + param_escape(ruleStr); - var rule_dlg = new dijit.Dialog({ + const rule_dlg = new dijit.Dialog({ id: "filterNewRuleDlg", title: ruleStr ? __("Edit rule") : __("Add rule"), style: "width: 600px", @@ -879,10 +827,10 @@ function addFilterAction(replaceNode, actionStr) { if (dijit.byId("filterNewActionDlg")) dijit.byId("filterNewActionDlg").destroyRecursive(); - var query = "backend.php?op=pref-filters&method=newaction&action=" + + const query = "backend.php?op=pref-filters&method=newaction&action=" + param_escape(actionStr); - var rule_dlg = new dijit.Dialog({ + const rule_dlg = new dijit.Dialog({ id: "filterNewActionDlg", title: actionStr ? __("Edit action") : __("Add action"), style: "width: 600px", @@ -910,7 +858,7 @@ function editFilterTest(query) { limit: 100, max_offset: 10000, getTestResults: function(query, offset) { - var updquery = query + "&offset=" + offset + "&limit=" + test_dlg.limit; + const updquery = query + "&offset=" + offset + "&limit=" + test_dlg.limit; console.log("getTestResults:" + offset); @@ -918,12 +866,12 @@ function editFilterTest(query) { parameters: updquery, onComplete: function (transport) { try { - var result = JSON.parse(transport.responseText); + const result = JSON.parse(transport.responseText); if (result && dijit.byId("filterTestDlg") && dijit.byId("filterTestDlg").open) { - test_dlg.results += result.size(); + test_dlg.results += result.length; - console.log("got results:" + result.size()); + console.log("got results:" + result.length); $("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...") .replace("%f", test_dlg.results) @@ -931,8 +879,8 @@ function editFilterTest(query) { console.log(offset + " " + test_dlg.max_offset); - for (var i = 0; i < result.size(); i++) { - var tmp = new Element("table"); + for (let i = 0; i < result.length; i++) { + const tmp = new Element("table"); tmp.innerHTML = result[i]; dojo.parser.parse(tmp); @@ -988,7 +936,7 @@ function editFilterTest(query) { } function quickAddFilter() { - var query = ""; + let query = ""; if (!inPreferences()) { query = "backend.php?op=pref-filters&method=newfilter&feed=" + param_escape(getActiveFeedId()) + "&is_cat=" + @@ -1005,12 +953,12 @@ function quickAddFilter() { if (dijit.byId("filterEditDlg")) dijit.byId("filterEditDlg").destroyRecursive(); - dialog = new dijit.Dialog({ + const dialog = new dijit.Dialog({ id: "filterEditDlg", title: __("Create Filter"), style: "width: 600px", test: function() { - var query = "backend.php?" + dojo.formToQuery("filter_new_form") + "&savemode=test"; + const query = "backend.php?" + dojo.formToQuery("filter_new_form") + "&savemode=test"; editFilterTest(query); }, @@ -1035,27 +983,27 @@ function quickAddFilter() { }); }, editRule: function(e) { - var li = e.parentNode; - var rule = li.getElementsByTagName("INPUT")[1].value; + const li = e.parentNode; + const rule = li.getElementsByTagName("INPUT")[1].value; addFilterRule(li, rule); }, editAction: function(e) { - var li = e.parentNode; - var action = li.getElementsByTagName("INPUT")[1].value; + const li = e.parentNode; + const action = li.getElementsByTagName("INPUT")[1].value; addFilterAction(li, action); }, addAction: function() { addFilterAction(); }, addRule: function() { addFilterRule(); }, deleteAction: function() { - $$("#filterDlg_Actions li.[class*=Selected]").each(function(e) { e.parentNode.removeChild(e) }); + $$("#filterDlg_Actions li[class*=Selected]").each(function(e) { e.parentNode.removeChild(e) }); }, deleteRule: function() { - $$("#filterDlg_Matches li.[class*=Selected]").each(function(e) { e.parentNode.removeChild(e) }); + $$("#filterDlg_Matches li[class*=Selected]").each(function(e) { e.parentNode.removeChild(e) }); }, execute: function() { if (this.validate()) { - var query = dojo.formToQuery("filter_new_form"); + const query = dojo.formToQuery("filter_new_form"); console.log(query); @@ -1073,41 +1021,41 @@ function quickAddFilter() { href: query}); if (!inPreferences()) { - var selectedText = getSelectionText(); + const selectedText = getSelectionText(); var lh = dojo.connect(dialog, "onLoad", function(){ dojo.disconnect(lh); if (selectedText != "") { - var feed_id = activeFeedIsCat() ? 'CAT:' + parseInt(getActiveFeedId()) : + const feed_id = activeFeedIsCat() ? 'CAT:' + parseInt(getActiveFeedId()) : getActiveFeedId(); - var rule = { reg_exp: selectedText, feed_id: [feed_id], filter_type: 1 }; + const rule = { reg_exp: selectedText, feed_id: [feed_id], filter_type: 1 }; addFilterRule(null, dojo.toJson(rule)); } else { - var query = "op=rpc&method=getlinktitlebyid&id=" + getActiveArticleId(); + const query = "op=rpc&method=getlinktitlebyid&id=" + getActiveArticleId(); new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - var reply = JSON.parse(transport.responseText); + const reply = JSON.parse(transport.responseText); - var title = false; + let title = false; - if (reply && reply) title = reply.title; + if (reply && reply.title) title = reply.title; if (title || getActiveFeedId() || activeFeedIsCat()) { console.log(title + " " + getActiveFeedId()); - var feed_id = activeFeedIsCat() ? 'CAT:' + parseInt(getActiveFeedId()) : + const feed_id = activeFeedIsCat() ? 'CAT:' + parseInt(getActiveFeedId()) : getActiveFeedId(); - var rule = { reg_exp: title, feed_id: [feed_id], filter_type: 1 }; + const rule = { reg_exp: title, feed_id: [feed_id], filter_type: 1 }; addFilterRule(null, dojo.toJson(rule)); } @@ -1125,12 +1073,12 @@ function quickAddFilter() { function unsubscribeFeed(feed_id, title) { - var msg = __("Unsubscribe from %s?").replace("%s", title); + const msg = __("Unsubscribe from %s?").replace("%s", title); if (title == undefined || confirm(msg)) { notify_progress("Removing feed..."); - var query = "?op=pref-feeds&quiet=1&method=remove&ids=" + feed_id; + const query = "?op=pref-feeds&quiet=1&method=remove&ids=" + feed_id; new Ajax.Request("backend.php", { parameters: query, @@ -1156,21 +1104,14 @@ function unsubscribeFeed(feed_id, title) { function backend_sanity_check_callback(transport) { - if (sanity_check_done) { - fatalError(11, "Sanity check request received twice. This can indicate "+ - "presence of Firebug or some other disrupting extension. "+ - "Please disable it and try again."); - return; - } - - var reply = JSON.parse(transport.responseText); + const reply = JSON.parse(transport.responseText); if (!reply) { fatalError(3, "Sanity check: invalid RPC reply", transport.responseText); return; } - var error_code = reply['error']['code']; + const error_code = reply['error']['code']; if (error_code && error_code != 0) { return fatalError(error_code, reply['error']['message']); @@ -1178,12 +1119,12 @@ function backend_sanity_check_callback(transport) { console.log("sanity check ok"); - var params = reply['init-params']; + const params = reply['init-params']; if (params) { console.log('reading init-params...'); - for (k in params) { + for (const k in params) { console.log("IP: " + k + " => " + JSON.stringify(params[k])); if (k == "label_base_index") _label_base_index = parseInt(params[k]); } @@ -1194,29 +1135,26 @@ function backend_sanity_check_callback(transport) { window.PluginHost && PluginHost.run(PluginHost.HOOK_PARAMS_LOADED, init_params); } - sanity_check_done = true; - init_second_stage(); - } function genUrlChangeKey(feed, is_cat) { - var ok = confirm(__("Generate new syndication address for this feed?")); + const ok = confirm(__("Generate new syndication address for this feed?")); if (ok) { notify_progress("Trying to change address...", true); - var query = "?op=pref-feeds&method=regenFeedKey&id=" + param_escape(feed) + + const query = "?op=pref-feeds&method=regenFeedKey&id=" + param_escape(feed) + "&is_cat=" + param_escape(is_cat); new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - var reply = JSON.parse(transport.responseText); - var new_link = reply.link; + const reply = JSON.parse(transport.responseText); + const new_link = reply.link; - var e = $('gen_feed_url'); + const e = $('gen_feed_url'); if (new_link) { @@ -1240,19 +1178,19 @@ function genUrlChangeKey(feed, is_cat) { // mode = all, none, invert function selectTableRows(id, mode) { - var rows = $(id).rows; + const rows = $(id).rows; - for (var i = 0; i < rows.length; i++) { - var row = rows[i]; - var cb = false; - var dcb = false; + for (let i = 0; i < rows.length; i++) { + const row = rows[i]; + let cb = false; + let dcb = false; if (row.id && row.className) { - var bare_id = row.id.replace(/^[A-Z]*?-/, ""); - var inputs = rows[i].getElementsByTagName("input"); + const bare_id = row.id.replace(/^[A-Z]*?-/, ""); + const inputs = rows[i].getElementsByTagName("input"); - for (var j = 0; j < inputs.length; j++) { - var input = inputs[j]; + for (let j = 0; j < inputs.length; j++) { + const input = inputs[j]; if (input.getAttribute("type") == "checkbox" && input.id.match(bare_id)) { @@ -1264,7 +1202,7 @@ function selectTableRows(id, mode) { } if (cb || dcb) { - var issel = row.hasClassName("Selected"); + const issel = row.hasClassName("Selected"); if (mode == "all" && !issel) { row.addClassName("Selected"); @@ -1294,13 +1232,13 @@ function selectTableRows(id, mode) { } function getSelectedTableRowIds(id) { - var rows = []; + const rows = []; - var elem_rows = $(id).rows; + const elem_rows = $(id).rows; - for (var i = 0; i < elem_rows.length; i++) { + for (let i = 0; i < elem_rows.length; i++) { if (elem_rows[i].hasClassName("Selected")) { - var bare_id = elem_rows[i].id.replace(/^[A-Z]*?-/, ""); + const bare_id = elem_rows[i].id.replace(/^[A-Z]*?-/, ""); rows.push(bare_id); } } @@ -1308,11 +1246,11 @@ function getSelectedTableRowIds(id) { return rows; } -function editFeed(feed, event) { +function editFeed(feed) { if (feed <= 0) return alert(__("You can't edit this kind of feed.")); - var query = "backend.php?op=pref-feeds&method=editfeed&id=" + + const query = "backend.php?op=pref-feeds&method=editfeed&id=" + param_escape(feed); console.log(query); @@ -1323,7 +1261,7 @@ function editFeed(feed, event) { if (dijit.byId("feedEditDlg")) dijit.byId("feedEditDlg").destroyRecursive(); - dialog = new dijit.Dialog({ + const dialog = new dijit.Dialog({ id: "feedEditDlg", title: __("Edit Feed"), style: "width: 600px", @@ -1348,7 +1286,7 @@ function editFeed(feed, event) { } function feedBrowser() { - var query = "backend.php?op=feeds&method=feedBrowser"; + const query = "backend.php?op=feeds&method=feedBrowser"; if (dijit.byId("feedAddDlg")) dijit.byId("feedAddDlg").hide(); @@ -1356,16 +1294,16 @@ function feedBrowser() { if (dijit.byId("feedBrowserDlg")) dijit.byId("feedBrowserDlg").destroyRecursive(); - var dialog = new dijit.Dialog({ + const dialog = new dijit.Dialog({ id: "feedBrowserDlg", title: __("More Feeds"), style: "width: 600px", getSelectedFeedIds: function () { - var list = $$("#browseFeedList li[id*=FBROW]"); - var selected = new Array(); + const list = $$("#browseFeedList li[id*=FBROW]"); + const selected = []; list.each(function (child) { - var id = child.id.replace("FBROW-", ""); + const id = child.id.replace("FBROW-", ""); if (child.hasClassName('Selected')) { selected.push(id); @@ -1375,12 +1313,12 @@ function feedBrowser() { return selected; }, getSelectedFeeds: function () { - var list = $$("#browseFeedList li.Selected"); - var selected = new Array(); + const list = $$("#browseFeedList li.Selected"); + const selected = []; list.each(function (child) { - var title = child.getElementsBySelector("span.fb_feedTitle")[0].innerHTML; - var url = child.getElementsBySelector("a.fb_feedUrl")[0].href; + const title = child.getElementsBySelector("span.fb_feedTitle")[0].innerHTML; + const url = child.getElementsBySelector("a.fb_feedUrl")[0].href; selected.push([title, url]); @@ -1390,8 +1328,8 @@ function feedBrowser() { }, subscribe: function () { - var mode = this.attr('value').mode; - var selected = []; + const mode = this.attr('value').mode; + let selected = []; if (mode == "1") selected = this.getSelectedFeeds(); @@ -1406,7 +1344,7 @@ function feedBrowser() { // we use dojo.toJson instead of JSON.stringify because // it somehow escapes everything TWICE, at least in Chrome 9 - var query = "?op=rpc&method=massSubscribe&payload=" + + const query = "?op=rpc&method=massSubscribe&payload=" + param_escape(dojo.toJson(selected)) + "&mode=" + param_escape(mode); console.log(query); @@ -1425,7 +1363,7 @@ function feedBrowser() { }, update: function () { - var query = dojo.objectToQuery(dialog.attr('value')); + const query = dojo.objectToQuery(dialog.attr('value')); Element.show('feed_browser_spinner'); @@ -1436,15 +1374,11 @@ function feedBrowser() { Element.hide('feed_browser_spinner'); - var c = $("browseFeedList"); - - var reply = JSON.parse(transport.responseText); + const reply = JSON.parse(transport.responseText); + const mode = reply['mode']; - var r = reply['content']; - var mode = reply['mode']; - - if (c && r) { - c.innerHTML = r; + if ($("browseFeedList") && reply['content']) { + $("browseFeedList").innerHTML = reply['content']; } dojo.parser.parse("browseFeedList"); @@ -1459,18 +1393,18 @@ function feedBrowser() { }); }, removeFromArchive: function () { - var selected = this.getSelectedFeedIds(); + const selected = this.getSelectedFeedIds(); if (selected.length > 0) { - var pr = __("Remove selected feeds from the archive? Feeds with stored articles will not be removed."); + const pr = __("Remove selected feeds from the archive? Feeds with stored articles will not be removed."); if (confirm(pr)) { Element.show('feed_browser_spinner'); - var query = "?op=rpc&method=remarchive&ids=" + + const query = "?op=rpc&method=remarchive&ids=" + param_escape(selected.toString()); - ; + new Ajax.Request("backend.php", { parameters: query, @@ -1493,12 +1427,12 @@ function feedBrowser() { } function showFeedsWithErrors() { - var query = "backend.php?op=pref-feeds&method=feedsWithErrors"; + const query = "backend.php?op=pref-feeds&method=feedsWithErrors"; if (dijit.byId("errorFeedsDlg")) dijit.byId("errorFeedsDlg").destroyRecursive(); - dialog = new dijit.Dialog({ + const dialog = new dijit.Dialog({ id: "errorFeedsDlg", title: __("Feeds with update errors"), style: "width: 600px", @@ -1506,17 +1440,17 @@ function showFeedsWithErrors() { return getSelectedTableRowIds("prefErrorFeedList"); }, removeSelected: function() { - var sel_rows = this.getSelectedFeeds(); + const sel_rows = this.getSelectedFeeds(); console.log(sel_rows); if (sel_rows.length > 0) { - var ok = confirm(__("Remove selected feeds?")); + const ok = confirm(__("Remove selected feeds?")); if (ok) { notify_progress("Removing selected feeds...", true); - var query = "?op=pref-feeds&method=remove&ids="+ + const query = "?op=pref-feeds&method=remove&ids="+ param_escape(sel_rows.toString()); new Ajax.Request("backend.php", { @@ -1542,17 +1476,17 @@ function showFeedsWithErrors() { } function get_timestamp() { - var date = new Date(); + const date = new Date(); return Math.round(date.getTime() / 1000); } function helpDialog(topic) { - var query = "backend.php?op=backend&method=help&topic=" + param_escape(topic); + const query = "backend.php?op=backend&method=help&topic=" + param_escape(topic); if (dijit.byId("helpDlg")) dijit.byId("helpDlg").destroyRecursive(); - dialog = new dijit.Dialog({ + const dialog = new dijit.Dialog({ id: "helpDlg", title: __("Help"), style: "width: 600px", @@ -1582,14 +1516,14 @@ function htmlspecialchars_decode (string, quote_style) { // * returns 1: '

this -> "

' // * example 2: htmlspecialchars_decode("&quot;"); // * returns 2: '"' - var optTemp = 0, + let optTemp = 0, i = 0, noquotes = false; if (typeof quote_style === 'undefined') { quote_style = 2; } string = string.toString().replace(/</g, '<').replace(/>/g, '>'); - var OPTS = { + const OPTS = { 'ENT_NOQUOTES': 0, 'ENT_HTML_QUOTE_SINGLE': 1, 'ENT_HTML_QUOTE_DOUBLE': 2, @@ -1637,13 +1571,13 @@ function feed_to_label_id(feed) { // http://stackoverflow.com/questions/6251937/how-to-get-selecteduser-highlighted-text-in-contenteditable-element-and-replac function getSelectionText() { - var text = ""; + let text = ""; if (typeof window.getSelection != "undefined") { - var sel = window.getSelection(); + const sel = window.getSelection(); if (sel.rangeCount) { - var container = document.createElement("div"); - for (var i = 0, len = sel.rangeCount; i < len; ++i) { + const container = document.createElement("div"); + for (let i = 0, len = sel.rangeCount; i < len; ++i) { container.appendChild(sel.getRangeAt(i).cloneContents()); } text = container.innerHTML; @@ -1658,13 +1592,13 @@ function getSelectionText() { } function openUrlPopup(url) { - var w = window.open(""); + const w = window.open(""); w.opener = null; w.location = url; } function openArticlePopup(id) { - var w = window.open("", + const w = window.open("", "ttrss_article_popup", "height=900,width=900,resizable=yes,status=no,location=no,menubar=no,directories=no,scrollbars=yes,toolbar=no");