From 70fa4230268a422d0b7eef1ea223ca5cc1c14646 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 18 Feb 2021 21:51:18 +0300 Subject: initial for RIP prototype/scriptaculous --- js/common.js | 135 ++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 105 insertions(+), 30 deletions(-) (limited to 'js/common.js') diff --git a/js/common.js b/js/common.js index fb5cc6531..982bb94a7 100755 --- a/js/common.js +++ b/js/common.js @@ -3,35 +3,117 @@ /* global dijit, __, App, Ajax */ /* eslint-disable no-new */ -/* error reporting shim */ -// TODO: deprecated; remove -/* function exception_error(e, e_compat, filename, lineno, colno) { - if (typeof e == "string") - e = e_compat; +Element.prototype.hasClassName = function(className) { + dojo.hasClass(this, className); +}; + +Element.prototype.addClassName = function(className) { + dojo.addClass(this, className); +}; + +Element.prototype.removeClassName = function(className) { + dojo.removeClass(this, className); +}; + +Element.prototype.setStyle = function(args) { + Object.keys(args).forEach((k) => { + this.style[k] = args[k]; + }); +}; + +Element.prototype.show = function() { + this.style.display = ""; +}; + +Element.prototype.hide = function() { + this.style.display = "none"; +}; + +Element.prototype.toggle = function() { + if (this.visible()) + this.show(); + else + this.hide(); +}; + +Element.prototype.visible = function() { + // TODO: should we actually check for offsetWidth/offsetHeight == 0? + return this.style.display != "none"; +} + +Element.visible = function(elem) { + if (typeof elem == "string") + elem = document.getElementById(elem); + + return elem.visible(); +} + +Element.show = function(elem) { + if (typeof elem == "string") + elem = document.getElementById(elem); + + return elem.show(); +} + +Element.hide = function(elem) { + if (typeof elem == "string") + elem = document.getElementById(elem); + + return elem.hide(); +} + +Element.toggle = function(elem) { + if (typeof elem == "string") + elem = document.getElementById(elem); + + return elem.toggle(); +} - App.Error.report(e, {filename: filename, lineno: lineno, colno: colno}); -} */ +Element.hasClassName = function (id, className) { + return document.getElementById(id).hasClassName(className); +} /* xhr shorthand helpers */ /* exported xhrPost */ -function xhrPost(url, params, complete) { +function xhrPost(url, params = {}, complete = undefined) { console.log("xhrPost:", params); return new Promise((resolve, reject) => { - new Ajax.Request(url, { - parameters: params, - onComplete: function(reply) { - if (complete != undefined) complete(reply); - - resolve(reply); - } - }); + if (typeof __csrf_token != "undefined") + params = {...params, ...{csrf_token: __csrf_token}}; + + dojo.xhrPost({url: url, + postData: dojo.objectToQuery(params), + handleAs: "text", + error: function(error) { + reject(error); + }, + load: function(data, ioargs) { + if (complete != undefined) + complete(ioargs.xhr); + + resolve(ioargs.xhr) + }}); }); } +Array.prototype.remove = function(s) { + for (let i=0; i < this.length; i++) { + if (s == this[i]) this.splice(i, 1); + } +}; + +Array.prototype.uniq = function() { + return this.filter((v, i, a) => a.indexOf(v) === i); +}; + +String.prototype.stripTags = function() { + return this.replace(/<\w+(\s+("[^"]*"|'[^']*'|[^>])+)?(\/)?>|<\/\w+>/gi, ''); +} + /* exported xhrJson */ -function xhrJson(url, params, complete) { +function xhrJson(url, params = {}, complete = undefined) { return new Promise((resolve, reject) => xhrPost(url, params).then((reply) => { let obj = null; @@ -48,13 +130,6 @@ function xhrJson(url, params, complete) { })); } -/* add method to remove element from array */ -Array.prototype.remove = function(s) { - for (let i=0; i < this.length; i++) { - if (s == this[i]) this.splice(i, 1); - } -}; - /* common helpers not worthy of separate Dojo modules */ /* exported Lists */ @@ -70,8 +145,8 @@ const Lists = { checked ? row.addClassName("Selected") : row.removeClassName("Selected"); }, select: function(elemId, selected) { - $(elemId).select("li").each((row) => { - const checkNode = row.select(".dijitCheckBox,input[type=checkbox]")[0]; + $(elemId).querySelectorAll("li").forEach((row) => { + const checkNode = row.querySelector(".dijitCheckBox,input[type=checkbox]"); if (checkNode) { const widget = dijit.getEnclosingWidget(checkNode); @@ -101,8 +176,8 @@ const Tables = { }, select: function(elemId, selected) { - $(elemId).select("tr").each((row) => { - const checkNode = row.select(".dijitCheckBox,input[type=checkbox]")[0]; + $(elemId).querySelector("tr").forEach((row) => { + const checkNode = row.querySelector(".dijitCheckBox,input[type=checkbox]"); if (checkNode) { const widget = dijit.getEnclosingWidget(checkNode); @@ -119,7 +194,7 @@ const Tables = { getSelected: function(elemId) { const rv = []; - $(elemId).select("tr").each((row) => { + $(elemId).querySelector("tr").forEach((row) => { if (row.hasClassName("Selected")) { // either older prefix-XXX notation or separate attribute const rowId = row.getAttribute("data-row-id") || row.id.replace(/^[A-Z]*?-/, ""); @@ -173,7 +248,7 @@ const Notify = { kind = kind || this.KIND_GENERIC; keep = keep || false; - const notify = $("notify"); + const notify = App.byId("notify"); window.clearTimeout(this.timeout); -- cgit v1.2.3-54-g00ecf From f77c17c6f00d37ac535f065589335e801824641b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 18 Feb 2021 22:05:06 +0300 Subject: add Element toggleClassName --- js/App.js | 22 ---------------------- js/common.js | 8 ++++++++ 2 files changed, 8 insertions(+), 22 deletions(-) (limited to 'js/common.js') diff --git a/js/App.js b/js/App.js index 0a66987ed..0055fcd4f 100644 --- a/js/App.js +++ b/js/App.js @@ -184,27 +184,6 @@ const App = { if (callback) callback(); } }, - /*enableCsrfSupport: function() { - const _this = this; - - Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap( - function (callOriginal, options) { - - if (_this.getInitParam("csrf_token") != undefined) { - Object.extend(options, options || { }); - - if (Object.isString(options.parameters)) - options.parameters = options.parameters.toQueryParams(); - else if (Object.isHash(options.parameters)) - options.parameters = options.parameters.toObject(); - - options.parameters["csrf_token"] = _this.getInitParam("csrf_token"); - } - - return callOriginal(options); - } - ); - }, */ postCurrentWindow: function(target, params) { const form = document.createElement("form"); @@ -663,7 +642,6 @@ const App = { this.setLoadingProgress(30); this.initHotkeyActions(); - //this.enableCsrfSupport(); const params = { op: "rpc", diff --git a/js/common.js b/js/common.js index 982bb94a7..95eaa3e36 100755 --- a/js/common.js +++ b/js/common.js @@ -15,6 +15,14 @@ Element.prototype.removeClassName = function(className) { dojo.removeClass(this, className); }; +Element.prototype.toggleClassName = function(className) { + if (this.hasClassName(className)) + this.removeClassName(className); + else + this.addClassName(className); +}; + + Element.prototype.setStyle = function(args) { Object.keys(args).forEach((k) => { this.style[k] = args[k]; -- cgit v1.2.3-54-g00ecf From e61e7c8356b86dfa1b89c7ae2ef78c8020c54d90 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 18 Feb 2021 22:14:40 +0300 Subject: compat shim fixes --- js/common.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'js/common.js') diff --git a/js/common.js b/js/common.js index 95eaa3e36..49a6dc0b7 100755 --- a/js/common.js +++ b/js/common.js @@ -4,22 +4,24 @@ /* eslint-disable no-new */ Element.prototype.hasClassName = function(className) { - dojo.hasClass(this, className); + return dojo.hasClass(this, className); }; Element.prototype.addClassName = function(className) { - dojo.addClass(this, className); + return dojo.addClass(this, className); }; Element.prototype.removeClassName = function(className) { - dojo.removeClass(this, className); + return dojo.removeClass(this, className); }; Element.prototype.toggleClassName = function(className) { + console.log(this, className); + if (this.hasClassName(className)) - this.removeClassName(className); + return this.removeClassName(className); else - this.addClassName(className); + return this.addClassName(className); }; @@ -77,8 +79,11 @@ Element.toggle = function(elem) { return elem.toggle(); } -Element.hasClassName = function (id, className) { - return document.getElementById(id).hasClassName(className); +Element.hasClassName = function (elem, className) { + if (typeof elem == "string") + elem = document.getElementById(elem); + + return elem.hasClassName(className); } /* xhr shorthand helpers */ -- cgit v1.2.3-54-g00ecf From 89fd9ec8c32863043e8a2385a6b2ef68fe984366 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 18 Feb 2021 22:15:54 +0300 Subject: compat shim fixes --- js/common.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/common.js') diff --git a/js/common.js b/js/common.js index 49a6dc0b7..74353c123 100755 --- a/js/common.js +++ b/js/common.js @@ -41,9 +41,9 @@ Element.prototype.hide = function() { Element.prototype.toggle = function() { if (this.visible()) - this.show(); - else this.hide(); + else + this.show(); }; Element.prototype.visible = function() { -- cgit v1.2.3-54-g00ecf From b6c3dde1cca77fd6e024b5ddc56dd25e600353ba Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 18 Feb 2021 22:26:00 +0300 Subject: add $/423 shims --- js/common.js | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'js/common.js') diff --git a/js/common.js b/js/common.js index 74353c123..9275bd09f 100755 --- a/js/common.js +++ b/js/common.js @@ -3,6 +3,17 @@ /* global dijit, __, App, Ajax */ /* eslint-disable no-new */ +function $(id) { + console.warn("FIXME: please use App.getById() or document.getElementById() instead of $():", id); + return document.getElementById(id); +} + +function $$(query) { + console.warn("FIXME: please use App.findAll() or document.querySelectorAll() instead of $():", query); + return document.querySelectorAll(query); +} + + Element.prototype.hasClassName = function(className) { return dojo.hasClass(this, className); }; -- cgit v1.2.3-54-g00ecf From d57e7eaa98b8669837d6ccb98d6f7d0d739f52e8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 19 Feb 2021 06:40:35 +0300 Subject: move stuff in common.js around a bit --- js/common.js | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'js/common.js') diff --git a/js/common.js b/js/common.js index 9275bd09f..1adf5d56e 100755 --- a/js/common.js +++ b/js/common.js @@ -27,8 +27,6 @@ Element.prototype.removeClassName = function(className) { }; Element.prototype.toggleClassName = function(className) { - console.log(this, className); - if (this.hasClassName(className)) return this.removeClassName(className); else @@ -97,6 +95,20 @@ Element.hasClassName = function (elem, className) { return elem.hasClassName(className); } +Array.prototype.remove = function(s) { + for (let i=0; i < this.length; i++) { + if (s == this[i]) this.splice(i, 1); + } +}; + +Array.prototype.uniq = function() { + return this.filter((v, i, a) => a.indexOf(v) === i); +}; + +String.prototype.stripTags = function() { + return this.replace(/<\w+(\s+("[^"]*"|'[^']*'|[^>])+)?(\/)?>|<\/\w+>/gi, ''); +} + /* xhr shorthand helpers */ /* exported xhrPost */ @@ -122,20 +134,6 @@ function xhrPost(url, params = {}, complete = undefined) { }); } -Array.prototype.remove = function(s) { - for (let i=0; i < this.length; i++) { - if (s == this[i]) this.splice(i, 1); - } -}; - -Array.prototype.uniq = function() { - return this.filter((v, i, a) => a.indexOf(v) === i); -}; - -String.prototype.stripTags = function() { - return this.replace(/<\w+(\s+("[^"]*"|'[^']*'|[^>])+)?(\/)?>|<\/\w+>/gi, ''); -} - /* exported xhrJson */ function xhrJson(url, params = {}, complete = undefined) { return new Promise((resolve, reject) => -- cgit v1.2.3-54-g00ecf From 00310d2d23dd459c17b3f6e86a127de348b330f8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 19 Feb 2021 06:58:50 +0300 Subject: cleanup some unused code, fix App.byId() invoked by wrong name --- classes/pref/prefs.php | 6 +++--- js/App.js | 2 -- js/Article.js | 10 ---------- js/Feeds.js | 8 -------- js/common.js | 2 +- plugins/note/note.js | 2 +- 6 files changed, 5 insertions(+), 25 deletions(-) (limited to 'js/common.js') diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index cfbf83d2a..fecec6d91 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -355,14 +355,14 @@ class Pref_Prefs extends Handler_Protected { Notify.close(); if (transport.responseText.indexOf('ERROR: ') == 0) { - $('pwd_change_infobox').innerHTML = + App.byId('pwd_change_infobox').innerHTML = transport.responseText.replace('ERROR: ', ''); } else { - $('pwd_change_infobox').innerHTML = + App.byId('pwd_change_infobox').innerHTML = transport.responseText.replace('ERROR: ', ''); - const warn = $('default_pass_warning'); + const warn = App.byId('default_pass_warning'); if (warn) Element.hide(warn); } diff --git a/js/App.js b/js/App.js index 0055fcd4f..f7a9254ba 100644 --- a/js/App.js +++ b/js/App.js @@ -1044,8 +1044,6 @@ const App = { }; this.hotkey_actions["feed_debug_viewfeed"] = () => { - //Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat(), viewfeed_debug: true}); - App.postOpenWindow("backend.php", {op: "feeds", method: "view", feed: Feeds.getActive(), timestamps: 1, debug: 1, cat: Feeds.activeIsCat(), csrf_token: __csrf_token}); }; diff --git a/js/Article.js b/js/Article.js index e7498f0b3..15c5cac65 100644 --- a/js/Article.js +++ b/js/Article.js @@ -93,16 +93,6 @@ const Article = { w.opener = null; w.location = url; }, - /* popupOpenArticle: function(id) { - 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"); - - if (w) { - w.opener = null; - w.location = "backend.php?op=article&method=view&mode=raw&html=1&zoom=1&id=" + id + "&csrf_token=" + App.getInitParam("csrf_token"); - } - }, */ cdmUnsetActive: function (event) { const row = App.byId("RROW-" + Article.getActive()); diff --git a/js/Feeds.js b/js/Feeds.js index 7f3a80f4e..67c78cbfe 100644 --- a/js/Feeds.js +++ b/js/Feeds.js @@ -317,7 +317,6 @@ const Feeds = { const feed = params.feed; const is_cat = !!params.is_cat || false; const offset = params.offset || 0; - const viewfeed_debug = params.viewfeed_debug; const append = params.append || false; const method = params.method; // this is used to quickly switch between feeds, sets active but xhr is on a timeout @@ -373,13 +372,6 @@ const Feeds = { this.setActive(feed, is_cat); - if (viewfeed_debug) { - window.open("backend.php?" + - dojo.objectToQuery( - Object.assign({csrf_token: App.getInitParam("csrf_token")}, query) - )); - } - window.clearTimeout(this._viewfeed_wait_timeout); this._viewfeed_wait_timeout = window.setTimeout(() => { xhrPost("backend.php", query, (transport) => { diff --git a/js/common.js b/js/common.js index 1adf5d56e..6dd5713df 100755 --- a/js/common.js +++ b/js/common.js @@ -4,7 +4,7 @@ /* eslint-disable no-new */ function $(id) { - console.warn("FIXME: please use App.getById() or document.getElementById() instead of $():", id); + console.warn("FIXME: please use App.byId() or document.getElementById() instead of $():", id); return document.getElementById(id); } diff --git a/plugins/note/note.js b/plugins/note/note.js index bc6c48156..d2d9c2b01 100644 --- a/plugins/note/note.js +++ b/plugins/note/note.js @@ -13,7 +13,7 @@ Plugins.Note = { dialog.hide(); if (reply) { - const elem = $("POSTNOTE-" + id); + const elem = App.byId("POSTNOTE-" + id); if (elem) { elem.innerHTML = reply.note; -- cgit v1.2.3-54-g00ecf From bec35200e97adabf4880a92bad40ec5bbe4848d1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 19 Feb 2021 07:29:21 +0300 Subject: fix some eslint-related stuff --- js/App.js | 121 +++++++++++++++++++++++++--------------------------- js/Article.js | 2 +- js/CommonDialogs.js | 2 +- js/CommonFilters.js | 4 +- js/PrefHelpers.js | 2 +- js/PrefUsers.js | 2 +- js/common.js | 5 ++- js/tt-rss.js | 2 +- 8 files changed, 69 insertions(+), 71 deletions(-) (limited to 'js/common.js') diff --git a/js/App.js b/js/App.js index f7a9254ba..d61c6ead0 100644 --- a/js/App.js +++ b/js/App.js @@ -1,9 +1,9 @@ 'use strict'; /* eslint-disable new-cap */ -/* global __, Article, Ajax, Headlines, Filters, fox */ -/* global xhrPost, xhrJson, dojo, dijit, PluginHost, Notify, $$, Feeds, Cookie */ -/* global CommonDialogs, Plugins, Effect */ +/* global __, Article, Headlines, Filters, fox */ +/* global xhrPost, xhrJson, dojo, dijit, PluginHost, Notify, Feeds, Cookie */ +/* global CommonDialogs, Plugins */ const App = { _initParams: [], @@ -234,7 +234,7 @@ const App = { }, urlParam: function(name) { try { - const results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href); + const results = new RegExp('[?&]' + name + '=([^&#]*)').exec(window.location.href); return decodeURIComponent(results[1].replace(/\+/g, " ")) || 0; } catch (e) { return 0; @@ -439,40 +439,38 @@ const App = { return false; }, parseRuntimeInfo: function(data) { - for (const k in data) { - if (data.hasOwnProperty(k)) { - const v = data[k]; + Object.keys(data).forEach((k) => { + const v = data[k]; - console.log("RI:", k, "=>", v); + console.log("RI:", k, "=>", v); - if (k == "daemon_is_running" && v != 1) { - Notify.error("Update daemon is not running.", true); - return; - } + if (k == "daemon_is_running" && v != 1) { + Notify.error("Update daemon is not running.", true); + return; + } - if (k == "recent_log_events") { - const alert = App.findAll(".log-alert")[0]; + if (k == "recent_log_events") { + const alert = App.findAll(".log-alert")[0]; - if (alert) { - v > 0 ? alert.show() : alert.hide(); - } - } + if (alert) { + v > 0 ? alert.show() : alert.hide(); + } + } - if (k == "daemon_stamp_ok" && v != 1) { - Notify.error("Update daemon is not updating feeds.", true); - return; - } + if (k == "daemon_stamp_ok" && v != 1) { + Notify.error("Update daemon is not updating feeds.", true); + return; + } - if (k == "max_feed_id" || k == "num_feeds") { - if (this.getInitParam(k) != v) { - console.log("feed count changed, need to reload feedlist."); - Feeds.reload(); - } - } + if (k == "max_feed_id" || k == "num_feeds") { + if (this.getInitParam(k) != v) { + console.log("feed count changed, need to reload feedlist."); + Feeds.reload(); + } + } - this.setInitParam(k, v); - } - } + this.setInitParam(k, v); + }); PluginHost.run(PluginHost.HOOK_RUNTIME_INFO_LOADED, data); }, @@ -500,39 +498,36 @@ const App = { if (params) { console.log('reading init-params...'); - for (const k in params) { - if (params.hasOwnProperty(k)) { - switch (k) { - case "label_base_index": - this.LABEL_BASE_INDEX = parseInt(params[k]); - break; - case "cdm_auto_catchup": - if (params[k] == 1) { - const hl = App.byId("headlines-frame"); - if (hl) hl.addClassName("auto_catchup"); - } - break; - case "hotkeys": - // filter mnemonic definitions (used for help panel) from hotkeys map - // i.e. *(191)|Ctrl-/ -> *(191) - { - const tmp = []; - for (const sequence in params[k][1]) { - if (params[k][1].hasOwnProperty(sequence)) { - const filtered = sequence.replace(/\|.*$/, ""); - tmp[filtered] = params[k][1][sequence]; - } - } - - params[k][1] = tmp; - } - break; - } + Object.keys(params).forEach((k) => { + switch (k) { + case "label_base_index": + this.LABEL_BASE_INDEX = parseInt(params[k]); + break; + case "cdm_auto_catchup": + if (params[k] == 1) { + const hl = App.byId("headlines-frame"); + if (hl) hl.addClassName("auto_catchup"); + } + break; + case "hotkeys": + // filter mnemonic definitions (used for help panel) from hotkeys map + // i.e. *(191)|Ctrl-/ -> *(191) + { + const tmp = []; + + Object.keys(params[k][1]).forEach((sequence) => { + const filtered = sequence.replace(/\|.*$/, ""); + tmp[filtered] = params[k][1][sequence]; + }); + + params[k][1] = tmp; + } + break; + } - console.log("IP:", k, "=>", params[k]); - this.setInitParam(k, params[k]); - } - } + console.log("IP:", k, "=>", params[k]); + this.setInitParam(k, params[k]); + }); // PluginHost might not be available on non-index pages if (typeof PluginHost !== 'undefined') diff --git a/js/Article.js b/js/Article.js index 15c5cac65..b1d14c390 100644 --- a/js/Article.js +++ b/js/Article.js @@ -1,7 +1,7 @@ 'use strict' /* eslint-disable no-new */ -/* global __, ngettext, App, Headlines, xhrPost, xhrJson, dojo, dijit, PluginHost, Notify, $$, Ajax, fox */ +/* global __, ngettext, App, Headlines, xhrPost, xhrJson, dojo, dijit, PluginHost, Notify, fox */ const Article = { _scroll_reset_timeout: false, diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js index c62e6893e..6ace91c8c 100644 --- a/js/CommonDialogs.js +++ b/js/CommonDialogs.js @@ -3,7 +3,7 @@ /* eslint-disable new-cap */ /* eslint-disable no-new */ -/* global __, dojo, dijit, Notify, App, Feeds, $$, xhrPost, xhrJson, Tables, Effect, fox */ +/* global __, dojo, dijit, Notify, App, Feeds, xhrPost, xhrJson, Tables, fox */ /* exported CommonDialogs */ const CommonDialogs = { diff --git a/js/CommonFilters.js b/js/CommonFilters.js index d5b751f91..3fa100b9e 100644 --- a/js/CommonFilters.js +++ b/js/CommonFilters.js @@ -2,8 +2,8 @@ /* eslint-disable no-new */ -/* global __, App, Article, Lists, Effect, fox */ -/* global xhrPost, dojo, dijit, Notify, $$, Feeds */ +/* global __, App, Article, Lists, fox */ +/* global xhrPost, dojo, dijit, Notify, Feeds */ const Filters = { filterDlgCheckAction: function(sender) { diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js index f3c44e30d..d4db15c3b 100644 --- a/js/PrefHelpers.js +++ b/js/PrefHelpers.js @@ -1,7 +1,7 @@ 'use strict'; /* eslint-disable no-new */ -/* global __, dijit, dojo, Tables, xhrPost, Notify, xhrJson, App, fox, Effect */ +/* global __, dijit, dojo, Tables, xhrPost, Notify, xhrJson, App, fox */ const Helpers = { AppPasswords: { diff --git a/js/PrefUsers.js b/js/PrefUsers.js index 2e8c9c4a8..64466ef18 100644 --- a/js/PrefUsers.js +++ b/js/PrefUsers.js @@ -1,7 +1,7 @@ 'use strict' /* global __ */ -/* global xhrPost, xhrJson, dojo, dijit, Notify, Tables, App, fox */ +/* global xhrPost, xhrJson, dijit, Notify, Tables, App, fox */ const Users = { reload: function(sort) { diff --git a/js/common.js b/js/common.js index 6dd5713df..a5e1e503a 100755 --- a/js/common.js +++ b/js/common.js @@ -1,6 +1,6 @@ 'use strict'; -/* global dijit, __, App, Ajax */ +/* global dijit, __, App, dojo, __csrf_token */ /* eslint-disable no-new */ function $(id) { @@ -111,6 +111,8 @@ String.prototype.stripTags = function() { /* xhr shorthand helpers */ +// TODO: this should become xhr { Post: ..., Json: ... } + /* exported xhrPost */ function xhrPost(url, params = {}, complete = undefined) { console.log("xhrPost:", params); @@ -144,6 +146,7 @@ function xhrJson(url, params = {}, complete = undefined) { obj = JSON.parse(reply.responseText); } catch (e) { console.error("xhrJson", e, reply); + reject(e); } if (complete != undefined) complete(obj); diff --git a/js/tt-rss.js b/js/tt-rss.js index a00838c43..8d7dd00a6 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -1,6 +1,6 @@ 'use strict' -/* global require, App, $H */ +/* global require, App, dojo */ /* exported Plugins */ const Plugins = {}; -- cgit v1.2.3-54-g00ecf From d26269865f633e36ab1eb1280550cbcc70dd8a4d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 19 Feb 2021 07:43:05 +0300 Subject: use .closest() instead of .up() to lookup parent by selector --- js/Article.js | 2 +- js/Headlines.js | 2 +- js/common.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'js/common.js') diff --git a/js/Article.js b/js/Article.js index b1d14c390..90be90f7b 100644 --- a/js/Article.js +++ b/js/Article.js @@ -63,7 +63,7 @@ const Article = { } }, setScore: function (id, pic) { - const row = pic.up("div[id*=RROW]"); + const row = pic.closest("div[id*=RROW]"); if (row) { const score_old = row.getAttribute("data-score"); diff --git a/js/Headlines.js b/js/Headlines.js index 143a42d0b..34dc9385e 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -1093,7 +1093,7 @@ const Headlines = { return rv; }, onRowChecked: function (elem) { - const row = elem.domNode.up("div[id*=RROW]"); + const row = elem.domNode.closest("div[id*=RROW]"); // do not allow unchecking active article checkbox if (row.hasClassName("active")) { diff --git a/js/common.js b/js/common.js index a5e1e503a..f96ac8da4 100755 --- a/js/common.js +++ b/js/common.js @@ -164,7 +164,7 @@ const Lists = { // account for dojo checkboxes elem = elem.domNode || elem; - const row = elem.up("li"); + const row = elem.closest("li"); if (row) checked ? row.addClassName("Selected") : row.removeClassName("Selected"); @@ -194,7 +194,7 @@ const Tables = { const checked = elem.domNode ? elem.attr("checked") : elem.checked; elem = elem.domNode || elem; - const row = elem.up("tr"); + const row = elem.closest("tr"); if (row) checked ? row.addClassName("Selected") : row.removeClassName("Selected"); -- cgit v1.2.3-54-g00ecf From f645120641cdcd42506401c2942ad8c080b69a02 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 19 Feb 2021 07:54:44 +0300 Subject: table helpers: don't try to iterate over a single element --- js/common.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/common.js') diff --git a/js/common.js b/js/common.js index f96ac8da4..7cbe1287b 100755 --- a/js/common.js +++ b/js/common.js @@ -201,7 +201,7 @@ const Tables = { }, select: function(elemId, selected) { - $(elemId).querySelector("tr").forEach((row) => { + $(elemId).querySelectorAll("tr").forEach((row) => { const checkNode = row.querySelector(".dijitCheckBox,input[type=checkbox]"); if (checkNode) { const widget = dijit.getEnclosingWidget(checkNode); @@ -219,7 +219,7 @@ const Tables = { getSelected: function(elemId) { const rv = []; - $(elemId).querySelector("tr").forEach((row) => { + $(elemId).querySelectorAll("tr").forEach((row) => { if (row.hasClassName("Selected")) { // either older prefix-XXX notation or separate attribute const rowId = row.getAttribute("data-row-id") || row.id.replace(/^[A-Z]*?-/, ""); -- cgit v1.2.3-54-g00ecf From dba6dce3b332f1c7cfb60e3411c6b85c01be7471 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 19 Feb 2021 10:15:36 +0300 Subject: add element fadeout/fadein and a shorter xhr helper --- js/common.js | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 74 insertions(+), 3 deletions(-) (limited to 'js/common.js') diff --git a/js/common.js b/js/common.js index 7cbe1287b..dbe1ae3c3 100755 --- a/js/common.js +++ b/js/common.js @@ -3,13 +3,15 @@ /* global dijit, __, App, dojo, __csrf_token */ /* eslint-disable no-new */ +/* exported $ */ function $(id) { console.warn("FIXME: please use App.byId() or document.getElementById() instead of $():", id); return document.getElementById(id); } +/* exported $$ */ function $$(query) { - console.warn("FIXME: please use App.findAll() or document.querySelectorAll() instead of $():", query); + console.warn("FIXME: please use App.findAll() or document.querySelectorAll() instead of $$():", query); return document.querySelectorAll(query); } @@ -55,6 +57,34 @@ Element.prototype.toggle = function() { this.show(); }; +// https://gist.github.com/alirezas/c4f9f43e9fe1abba9a4824dd6fc60a55 +Element.prototype.fadeOut = function() { + this.style.opacity = 1; + const self = this; + + (function fade() { + if ((self.style.opacity -= 0.1) < 0) { + self.style.display = "none"; + } else { + requestAnimationFrame(fade); + } + }()); +}; + +Element.prototype.fadeIn = function(display){ + this.style.opacity = 0; + this.style.display = display || "block"; + const self = this; + + (function fade() { + let val = parseFloat(self.style.opacity); + if (!((val += 0.1) > 1)) { + self.style.opacity = val; + requestAnimationFrame(fade); + } + }()); +}; + Element.prototype.visible = function() { // TODO: should we actually check for offsetWidth/offsetHeight == 0? return this.style.display != "none"; @@ -109,9 +139,50 @@ String.prototype.stripTags = function() { return this.replace(/<\w+(\s+("[^"]*"|'[^']*'|[^>])+)?(\/)?>|<\/\w+>/gi, ''); } -/* xhr shorthand helpers */ +/* exported xhr */ + +const xhr = { + post: function(url, params = {}, complete = undefined) { + console.log("xhr.post:", params); + + return new Promise((resolve, reject) => { + if (typeof __csrf_token != "undefined") + params = {...params, ...{csrf_token: __csrf_token}}; + + dojo.xhrPost({url: url, + postData: dojo.objectToQuery(params), + handleAs: "text", + error: function(error) { + reject(error); + }, + load: function(data, ioargs) { + if (complete != undefined) + complete(data, ioargs.xhr); + + resolve(data) + }} + ); + }); + }, + json: function(url, params = {}, complete = undefined) { + return new Promise((resolve, reject) => + this.post(url, params).then((data) => { + let obj = null; + + try { + obj = JSON.parse(data); + } catch (e) { + console.error("xhr.json", e, xhr); + reject(e); + } + + if (complete != undefined) complete(obj); -// TODO: this should become xhr { Post: ..., Json: ... } + resolve(obj); + } + )); + } +}; /* exported xhrPost */ function xhrPost(url, params = {}, complete = undefined) { -- cgit v1.2.3-54-g00ecf From 6b43b788d909ce20f07f29f9f3ccd2f6a8715616 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 19 Feb 2021 10:22:00 +0300 Subject: migrate xhrJson invocations to the new helper --- include/login_form.php | 2 +- js/App.js | 2 +- js/Article.js | 4 ++-- js/CommonDialogs.js | 12 ++++++------ js/Feeds.js | 2 +- js/PrefFeedTree.js | 8 ++++---- js/PrefHelpers.js | 4 ++-- js/PrefLabelTree.js | 2 +- js/PrefUsers.js | 2 +- js/common.js | 22 ++++++---------------- plugins/af_readability/init.js | 2 +- plugins/mail/init.php | 2 +- plugins/mail/mail.js | 2 +- plugins/note/note.js | 2 +- plugins/share/share.js | 2 +- 15 files changed, 30 insertions(+), 40 deletions(-) (limited to 'js/common.js') diff --git a/include/login_form.php b/include/login_form.php index d1af23459..211302a87 100755 --- a/include/login_form.php +++ b/include/login_form.php @@ -59,7 +59,7 @@ if (login && login != this.previousLogin) { this.previousLogin = login; - xhrJson("public.php", {op: "getprofiles", login: login}, + xhr.json("public.php", {op: "getprofiles", login: login}, (reply) => { const profile = dijit.byId('profile'); diff --git a/js/App.js b/js/App.js index d61c6ead0..0c12c7e6f 100644 --- a/js/App.js +++ b/js/App.js @@ -775,7 +775,7 @@ const App = { checkForUpdates: function() { console.log('checking for updates...'); - xhrJson("backend.php", {op: 'rpc', method: 'checkforupdates'}) + xhr.json("backend.php", {op: 'rpc', method: 'checkforupdates'}) .then((reply) => { console.log('update reply', reply); diff --git a/js/Article.js b/js/Article.js index 90be90f7b..379e05644 100644 --- a/js/Article.js +++ b/js/Article.js @@ -115,7 +115,7 @@ const Article = { displayUrl: function (id) { const query = {op: "article", method: "getmetadatabyid", id: id}; - xhrJson("backend.php", query, (reply) => { + xhr.json("backend.php", query, (reply) => { if (reply && reply.link) { prompt(__("Article URL:"), reply.link); } else { @@ -358,7 +358,7 @@ const Article = { const tmph = dojo.connect(dialog, 'onShow', function () { dojo.disconnect(tmph); - xhrJson("backend.php", {op: "article", method: "printArticleTags", id: id}, (reply) => { + xhr.json("backend.php", {op: "article", method: "printArticleTags", id: id}, (reply) => { dijit.getEnclosingWidget(App.byId("tags_str")) .attr('value', reply.tags.join(", ")) diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js index 6ace91c8c..3acd2b577 100644 --- a/js/CommonDialogs.js +++ b/js/CommonDialogs.js @@ -78,7 +78,7 @@ const CommonDialogs = { return false; }, subscribeToFeed: function() { - xhrJson("backend.php", + xhr.json("backend.php", {op: "feeds", method: "subscribeToFeed"}, (reply) => { const dialog = new fox.SingleUseDialog({ @@ -265,7 +265,7 @@ const CommonDialogs = { }, showFeedsWithErrors: function() { - xhrJson("backend.php", {op: "pref-feeds", method: "feedsWithErrors"}, (reply) => { + xhr.json("backend.php", {op: "pref-feeds", method: "feedsWithErrors"}, (reply) => { const dialog = new fox.SingleUseDialog({ id: "errorFeedsDlg", @@ -446,7 +446,7 @@ const CommonDialogs = { Notify.progress("Loading, please wait...", true); - xhrJson("backend.php", {op: "pref-feeds", method: "getOPMLKey"}, (reply) => { + xhr.json("backend.php", {op: "pref-feeds", method: "getOPMLKey"}, (reply) => { try { const dialog = new fox.SingleUseDialog({ title: __("Public OPML URL"), @@ -454,7 +454,7 @@ const CommonDialogs = { if (confirm(__("Replace current OPML publishing address with a new one?"))) { Notify.progress("Trying to change address...", true); - xhrJson("backend.php", {op: "pref-feeds", method: "regenOPMLKey"}, (reply) => { + xhr.json("backend.php", {op: "pref-feeds", method: "regenOPMLKey"}, (reply) => { if (reply) { const new_link = reply.link; const target = this.domNode.querySelector('.generated_url'); @@ -504,7 +504,7 @@ const CommonDialogs = { Notify.progress("Loading, please wait...", true); - xhrJson("backend.php", {op: "pref-feeds", method: "getsharedurl", id: feed, is_cat: is_cat, search: search}, (reply) => { + xhr.json("backend.php", {op: "pref-feeds", method: "getsharedurl", id: feed, is_cat: is_cat, search: search}, (reply) => { try { const dialog = new fox.SingleUseDialog({ title: __("Show as feed"), @@ -515,7 +515,7 @@ const CommonDialogs = { const query = {op: "pref-feeds", method: "regenFeedKey", id: feed, is_cat: is_cat}; - xhrJson("backend.php", query, (reply) => { + xhr.json("backend.php", query, (reply) => { const new_link = reply.link; const target = this.domNode.querySelector(".generated_url"); diff --git a/js/Feeds.js b/js/Feeds.js index 67c78cbfe..7cefe2235 100644 --- a/js/Feeds.js +++ b/js/Feeds.js @@ -558,7 +558,7 @@ const Feeds = { return tree.model.store.getValue(nuf, 'bare_id'); }, search: function() { - xhrJson("backend.php", + xhr.json("backend.php", {op: "feeds", method: "search"}, (reply) => { try { diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js index 92194e037..c7228e6ff 100644 --- a/js/PrefFeedTree.js +++ b/js/PrefFeedTree.js @@ -210,14 +210,14 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b return false; }, checkErrorFeeds: function() { - xhrJson("backend.php", {op: "pref-feeds", method: "feedsWithErrors"}, (reply) => { + xhr.json("backend.php", {op: "pref-feeds", method: "feedsWithErrors"}, (reply) => { if (reply.length > 0) { Element.show(dijit.byId("pref_feeds_errors_btn").domNode); } }); }, checkInactiveFeeds: function() { - xhrJson("backend.php", {op: "pref-feeds", method: "inactivefeeds"}, (reply) => { + xhr.json("backend.php", {op: "pref-feeds", method: "inactivefeeds"}, (reply) => { if (reply.length > 0) { Element.show(dijit.byId("pref_feeds_inactive_btn").domNode); } @@ -385,7 +385,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b } }, batchSubscribe: function() { - xhrJson("backend.php", {op: 'pref-feeds', method: 'batchSubscribe'}, (reply) => { + xhr.json("backend.php", {op: 'pref-feeds', method: 'batchSubscribe'}, (reply) => { const dialog = new fox.SingleUseDialog({ id: "batchSubDlg", title: __("Batch subscribe"), @@ -458,7 +458,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b }); }, showInactiveFeeds: function() { - xhrJson("backend.php", {op: 'pref-feeds', method: 'inactivefeeds'}, function (reply) { + xhr.json("backend.php", {op: 'pref-feeds', method: 'inactivefeeds'}, function (reply) { const dialog = new fox.SingleUseDialog({ id: "inactiveFeedsDlg", diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js index d4db15c3b..c17966291 100644 --- a/js/PrefHelpers.js +++ b/js/PrefHelpers.js @@ -132,7 +132,7 @@ const Helpers = { } }, refresh: function() { - xhrJson("backend.php", {op: 'pref-prefs', method: 'getprofiles'}, (reply) => { + xhr.json("backend.php", {op: 'pref-prefs', method: 'getprofiles'}, (reply) => { dialog.attr('content', `
@@ -212,7 +212,7 @@ const Helpers = { }, Prefs: { customizeCSS: function() { - xhrJson("backend.php", {op: "pref-prefs", method: "customizeCSS"}, (reply) => { + xhr.json("backend.php", {op: "pref-prefs", method: "customizeCSS"}, (reply) => { const dialog = new fox.SingleUseDialog({ title: __("Customize stylesheet"), diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js index 4392dfc44..9d16a147c 100644 --- a/js/PrefLabelTree.js +++ b/js/PrefLabelTree.js @@ -61,7 +61,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f }); }, editLabel: function(id) { - xhrJson("backend.php", {op: "pref-labels", method: "edit", id: id}, (reply) => { + xhr.json("backend.php", {op: "pref-labels", method: "edit", id: id}, (reply) => { console.log(reply); diff --git a/js/PrefUsers.js b/js/PrefUsers.js index 64466ef18..5b490a2a5 100644 --- a/js/PrefUsers.js +++ b/js/PrefUsers.js @@ -27,7 +27,7 @@ const Users = { } }, edit: function(id) { - xhrJson('backend.php', {op: 'pref-users', method: 'edit', id: id}, (reply) => { + xhr.json('backend.php', {op: 'pref-users', method: 'edit', id: id}, (reply) => { const user = reply.user; const admin_disabled = (user.id == 1); diff --git a/js/common.js b/js/common.js index dbe1ae3c3..f3fcdd905 100755 --- a/js/common.js +++ b/js/common.js @@ -143,7 +143,7 @@ String.prototype.stripTags = function() { const xhr = { post: function(url, params = {}, complete = undefined) { - console.log("xhr.post:", params); + console.log('xhr.post', '>>>', params); return new Promise((resolve, reject) => { if (typeof __csrf_token != "undefined") @@ -156,6 +156,8 @@ const xhr = { reject(error); }, load: function(data, ioargs) { + //console.log('xhr.post', '<<<', data, ioargs); + if (complete != undefined) complete(data, ioargs.xhr); @@ -176,6 +178,8 @@ const xhr = { reject(e); } + console.log('xhr.json', '<<<', obj); + if (complete != undefined) complete(obj); resolve(obj); @@ -209,21 +213,7 @@ function xhrPost(url, params = {}, complete = undefined) { /* exported xhrJson */ function xhrJson(url, params = {}, complete = undefined) { - return new Promise((resolve, reject) => - xhrPost(url, params).then((reply) => { - let obj = null; - - try { - obj = JSON.parse(reply.responseText); - } catch (e) { - console.error("xhrJson", e, reply); - reject(e); - } - - if (complete != undefined) complete(obj); - - resolve(obj); - })); + return xhr.json(url, params, complete); } /* common helpers not worthy of separate Dojo modules */ diff --git a/plugins/af_readability/init.js b/plugins/af_readability/init.js index 6dec82f45..5297416b3 100644 --- a/plugins/af_readability/init.js +++ b/plugins/af_readability/init.js @@ -16,7 +16,7 @@ Plugins.Af_Readability = { Notify.progress("Loading, please wait..."); - xhrJson("backend.php", App.getPhArgs("af_readability", "embed", {id: id}), (reply) => { + xhr.json("backend.php", App.getPhArgs("af_readability", "embed", {id: id}), (reply) => { if (content && reply.content) { content.setAttribute(self.orig_attr_name, content.innerHTML); diff --git a/plugins/mail/init.php b/plugins/mail/init.php index d96006b21..16e22f342 100644 --- a/plugins/mail/init.php +++ b/plugins/mail/init.php @@ -152,7 +152,7 @@ class Mail extends Plugin { diff --git a/js/App.js b/js/App.js index 0c12c7e6f..1b0fa7c65 100644 --- a/js/App.js +++ b/js/App.js @@ -2,7 +2,7 @@ /* eslint-disable new-cap */ /* global __, Article, Headlines, Filters, fox */ -/* global xhrPost, xhrJson, dojo, dijit, PluginHost, Notify, Feeds, Cookie */ +/* global xhrPost, xhr, dojo, dijit, PluginHost, Notify, Feeds, Cookie */ /* global CommonDialogs, Plugins */ const App = { @@ -362,10 +362,10 @@ const App = { } }, hotkeyHelp: function() { - xhrPost("backend.php", {op: "rpc", method: "hotkeyHelp"}, (transport) => { + xhr.post("backend.php", {op: "rpc", method: "hotkeyHelp"}, (reply) => { const dialog = new fox.SingleUseDialog({ title: __("Keyboard shortcuts"), - content: transport.responseText, + content: reply, }); dialog.show(); @@ -474,11 +474,9 @@ const App = { PluginHost.run(PluginHost.HOOK_RUNTIME_INFO_LOADED, data); }, - backendSanityCallback: function(transport) { - const reply = JSON.parse(transport.responseText); - + backendSanityCallback: function(reply) { if (!reply) { - this.Error.fatal(ERRORS[3], {info: transport.responseText}); + this.Error.fatal(ERRORS[3]); return; } @@ -559,14 +557,14 @@ const App = { const message = params.message ? params.message : error.toString(); try { - xhrPost("backend.php", + xhr.post("backend.php", {op: "rpc", method: "log", file: params.filename ? params.filename : error.fileName, line: params.lineno ? params.lineno : error.lineNumber, msg: message, context: error.stack}, - (transport) => { - console.warn("[Error.report] log response", transport.responseText); + (reply) => { + console.warn("[Error.report] log response", reply); }); } catch (re) { console.error("[Error.report] exception while saving logging error on server", re); @@ -645,9 +643,9 @@ const App = { hasSandbox: "sandbox" in document.createElement("iframe") }; - xhrPost("backend.php", params, (transport) => { + xhr.json("backend.php", params, (reply) => { try { - this.backendSanityCallback(transport); + this.backendSanityCallback(reply); } catch (e) { this.Error.report(e); } @@ -862,7 +860,7 @@ const App = { if (article_id) Article.view(article_id); - xhrPost("backend.php", {op: "rpc", method: "setpanelmode", wide: wide ? 1 : 0}); + xhr.post("backend.php", {op: "rpc", method: "setpanelmode", wide: wide ? 1 : 0}); }, initHotkeyActions: function() { if (this.is_prefs) { @@ -1058,7 +1056,7 @@ const App = { Headlines.reverse(); }; this.hotkey_actions["feed_toggle_vgroup"] = () => { - xhrPost("backend.php", {op: "rpc", method: "togglepref", key: "VFEED_GROUP_BY_FEED"}, () => { + xhr.post("backend.php", {op: "rpc", method: "togglepref", key: "VFEED_GROUP_BY_FEED"}, () => { Feeds.reloadCurrent(); }) }; @@ -1133,7 +1131,7 @@ const App = { this.hotkey_actions["toggle_combined_mode"] = () => { const value = this.isCombinedMode() ? "false" : "true"; - xhrPost("backend.php", {op: "rpc", method: "setpref", key: "COMBINED_DISPLAY_MODE", value: value}, () => { + xhr.post("backend.php", {op: "rpc", method: "setpref", key: "COMBINED_DISPLAY_MODE", value: value}, () => { this.setInitParam("combined_display_mode", !this.getInitParam("combined_display_mode")); @@ -1144,7 +1142,7 @@ const App = { this.hotkey_actions["toggle_cdm_expanded"] = () => { const value = this.getInitParam("cdm_expanded") ? "false" : "true"; - xhrPost("backend.php", {op: "rpc", method: "setpref", key: "CDM_EXPANDED", value: value}, () => { + xhr.post("backend.php", {op: "rpc", method: "setpref", key: "CDM_EXPANDED", value: value}, () => { this.setInitParam("cdm_expanded", !this.getInitParam("cdm_expanded")); Headlines.renderAgain(); }); diff --git a/js/Article.js b/js/Article.js index 379e05644..339d26266 100644 --- a/js/Article.js +++ b/js/Article.js @@ -1,7 +1,7 @@ 'use strict' /* eslint-disable no-new */ -/* global __, ngettext, App, Headlines, xhrPost, xhrJson, dojo, dijit, PluginHost, Notify, fox */ +/* global __, ngettext, App, Headlines, xhr, dojo, dijit, PluginHost, Notify, fox */ const Article = { _scroll_reset_timeout: false, @@ -331,13 +331,11 @@ const Article = { if (this.validate()) { Notify.progress("Saving article tags...", true); - xhrPost("backend.php", this.attr('value'), (transport) => { + xhr.json("backend.php", this.attr('value'), (data) => { try { Notify.close(); dialog.hide(); - const data = JSON.parse(transport.responseText); - if (data) { const id = data.id; diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js index 3acd2b577..516da5c98 100644 --- a/js/CommonDialogs.js +++ b/js/CommonDialogs.js @@ -3,7 +3,7 @@ /* eslint-disable new-cap */ /* eslint-disable no-new */ -/* global __, dojo, dijit, Notify, App, Feeds, xhrPost, xhrJson, Tables, fox */ +/* global __, dojo, dijit, Notify, App, Feeds, xhrPost, xhr, Tables, fox */ /* exported CommonDialogs */ const CommonDialogs = { @@ -17,7 +17,7 @@ const CommonDialogs = { const query = {op: "pref-feeds", method: "removeicon", feed_id: id}; - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { Notify.info("Feed icon removed."); if (App.isPrefs()) @@ -180,17 +180,12 @@ const CommonDialogs = { Element.show("feed_add_spinner"); Element.hide("fadd_error_message"); - xhrPost("backend.php", this.attr('value'), (transport) => { + xhr.json("backend.php", this.attr('value'), (reply) => { try { - let reply; - - try { - reply = JSON.parse(transport.responseText); - } catch (e) { + if (!reply) { 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('subscribeToFeed, backend returned:' + transport.responseText); return; } @@ -285,7 +280,7 @@ const CommonDialogs = { ids: sel_rows.toString() }; - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { Notify.close(); dialog.hide(); @@ -359,7 +354,7 @@ const CommonDialogs = { Notify.progress("Loading, please wait...", true); - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { if (dijit.byId("labelTree")) { dijit.byId("labelTree").reload(); } else { @@ -377,7 +372,7 @@ const CommonDialogs = { const query = {op: "pref-feeds", quiet: 1, method: "remove", ids: feed_id}; - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { if (App.isPrefs()) { dijit.byId("feedTree").reload(); } else { @@ -415,7 +410,7 @@ const CommonDialogs = { if (this.validate()) { Notify.progress("Saving data...", true); - xhrPost("backend.php", dialog.attr('value'), () => { + xhr.post("backend.php", dialog.attr('value'), () => { dialog.hide(); Notify.close(); diff --git a/js/CommonFilters.js b/js/CommonFilters.js index 3fa100b9e..9cc93d7b8 100644 --- a/js/CommonFilters.js +++ b/js/CommonFilters.js @@ -3,7 +3,7 @@ /* eslint-disable no-new */ /* global __, App, Article, Lists, fox */ -/* global xhrPost, dojo, dijit, Notify, Feeds */ +/* global xhr, dojo, dijit, Notify, Feeds */ const Filters = { filterDlgCheckAction: function(sender) { @@ -275,7 +275,7 @@ const Filters = { const query = {op: "pref-filters", method: "remove", ids: this.attr('value').id}; - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { const tree = dijit.byId("filterTree"); if (tree) tree.reload(); @@ -303,7 +303,7 @@ const Filters = { Notify.progress("Saving data...", true); - xhrPost("backend.php", this.attr('value'), () => { + xhr.post("backend.php", this.attr('value'), () => { dialog.hide(); const tree = dijit.byId("filterTree"); diff --git a/js/Feeds.js b/js/Feeds.js index 7cefe2235..e9681953e 100644 --- a/js/Feeds.js +++ b/js/Feeds.js @@ -1,6 +1,6 @@ 'use strict' -/* global __, App, Headlines, xhrPost, xhrJson, dojo, dijit, Form, fox, PluginHost, Notify, $$, fox */ +/* global __, App, Headlines, xhrPost, xhr, dojo, dijit, fox, PluginHost, Notify, fox */ const Feeds = { counters_last_request: 0, @@ -299,7 +299,7 @@ const Feeds = { toggleUnread: function() { const hide = !App.getInitParam("hide_read_feeds"); - xhrPost("backend.php", {op: "rpc", method: "setpref", key: "HIDE_READ_FEEDS", value: hide}, () => { + xhr.post("backend.php", {op: "rpc", method: "setpref", key: "HIDE_READ_FEEDS", value: hide}, () => { this.hideOrShowFeeds(hide); App.setInitParam("hide_read_feeds", hide); }); @@ -393,7 +393,7 @@ const Feeds = { Notify.progress("Marking all feeds as read..."); - xhrPost("backend.php", {op: "feeds", method: "catchupAll"}, () => { + xhr.post("backend.php", {op: "feeds", method: "catchupAll"}, () => { this.requestCounters(true); this.reloadCurrent(); }); diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js index c7228e6ff..d3a4cd33d 100644 --- a/js/PrefFeedTree.js +++ b/js/PrefFeedTree.js @@ -1,5 +1,5 @@ /* eslint-disable prefer-rest-params */ -/* global __, lib, dijit, define, dojo, CommonDialogs, Notify, Tables, xhrPost, xhrJson, fox, App */ +/* global __, lib, dijit, define, dojo, CommonDialogs, Notify, Tables, xhrPost, xhr, fox, App */ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_base/array", "dojo/cookie"], function (declare, domConstruct, checkBoxTree, array, cookie) { @@ -164,14 +164,14 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b resetFeedOrder: function() { Notify.progress("Loading, please wait..."); - xhrPost("backend.php", {op: "pref-feeds", method: "feedsortreset"}, () => { + xhr.post("backend.php", {op: "pref-feeds", method: "feedsortreset"}, () => { this.reload(); }); }, resetCatOrder: function() { Notify.progress("Loading, please wait..."); - xhrPost("backend.php", {op: "pref-feeds", method: "catsortreset"}, () => { + xhr.post("backend.php", {op: "pref-feeds", method: "catsortreset"}, () => { this.reload(); }); }, @@ -179,7 +179,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b if (confirm(__("Remove category %s? Any nested feeds would be placed into Uncategorized.").replace("%s", item.name))) { Notify.progress("Removing category..."); - xhrPost("backend.php", {op: "pref-feeds", method: "removeCat", ids: id}, () => { + xhr.post("backend.php", {op: "pref-feeds", method: "removeCat", ids: id}, () => { Notify.close(); this.reload(); }); @@ -198,7 +198,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b ids: sel_rows.toString() }; - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { this.reload(); }); } @@ -247,7 +247,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b ids: sel_rows.toString() }; - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { this.reload(); }); } @@ -338,7 +338,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b Notify.progress("Saving data...", true); - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { dialog.hide(); const tree = dijit.byId("feedTree"); @@ -367,7 +367,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b Notify.progress("Loading, please wait..."); - xhrPost("backend.php", { op: 'pref-feeds', method: 'renamecat', id: id, title: new_name }, () => { + xhr.post("backend.php", { op: 'pref-feeds', method: 'renamecat', id: id, title: new_name }, () => { this.reload(); }); } @@ -378,7 +378,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b if (title) { Notify.progress("Creating category..."); - xhrPost("backend.php", {op: "pref-feeds", method: "addCat", cat: title}, () => { + xhr.post("backend.php", {op: "pref-feeds", method: "addCat", cat: title}, () => { Notify.close(); this.reload(); }); @@ -393,7 +393,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b if (this.validate()) { Notify.progress(__("Subscribing to feeds..."), true); - xhrPost("backend.php", this.attr('value'), () => { + xhr.post("backend.php", this.attr('value'), () => { Notify.close(); const tree = dijit.byId("feedTree"); @@ -478,7 +478,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b ids: sel_rows.toString() }; - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { Notify.close(); const tree = dijit.byId("feedTree"); diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js index 3d00c730c..cc37808be 100644 --- a/js/PrefFilterTree.js +++ b/js/PrefFilterTree.js @@ -1,5 +1,5 @@ /* eslint-disable prefer-rest-params */ -/* global __, define, lib, dijit, dojo, xhrPost, Notify */ +/* global __, define, lib, dijit, dojo, xhr, Notify */ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], function (declare, domConstruct) { @@ -99,7 +99,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio resetFilterOrder: function() { Notify.progress("Loading, please wait..."); - xhrPost("backend.php", {op: "pref-filters", method: "filtersortreset"}, () => { + xhr.post("backend.php", {op: "pref-filters", method: "filtersortreset"}, () => { this.reload(); }); }, @@ -114,7 +114,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio if (confirm(__("Combine selected filters?"))) { Notify.progress("Joining filters..."); - xhrPost("backend.php", {op: "pref-filters", method: "join", ids: rows.toString()}, () => { + xhr.post("backend.php", {op: "pref-filters", method: "join", ids: rows.toString()}, () => { this.reload(); }); } @@ -131,7 +131,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio ids: sel_rows.toString() }; - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { this.reload(); }); } diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js index c17966291..abf5fff51 100644 --- a/js/PrefHelpers.js +++ b/js/PrefHelpers.js @@ -1,7 +1,7 @@ 'use strict'; /* eslint-disable no-new */ -/* global __, dijit, dojo, Tables, xhrPost, Notify, xhrJson, App, fox */ +/* global __, dijit, dojo, Tables, xhrPost, Notify, xhr, App, fox */ const Helpers = { AppPasswords: { @@ -45,7 +45,7 @@ const Helpers = { if (confirm(__("This will invalidate all previously generated feed URLs. Continue?"))) { Notify.progress("Clearing URLs..."); - xhrPost("backend.php", {op: "pref-feeds", method: "clearKeys"}, () => { + xhr.post("backend.php", {op: "pref-feeds", method: "clearKeys"}, () => { Notify.info("Generated URLs cleared."); }); } @@ -82,7 +82,7 @@ const Helpers = { Notify.progress("Loading, please wait..."); - xhrPost("backend.php", {op: "pref-system", method: "clearLog"}, () => { + xhr.post("backend.php", {op: "pref-system", method: "clearLog"}, () => { Helpers.EventLog.refresh(); }); } @@ -108,7 +108,7 @@ const Helpers = { ids: sel_rows.toString() }; - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { Notify.close(); dialog.refresh(); }); @@ -124,7 +124,7 @@ const Helpers = { const query = {op: "pref-prefs", method: "addprofile", title: dialog.attr('value').newprofile}; - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { Notify.close(); dialog.refresh(); }); @@ -194,7 +194,7 @@ const Helpers = { if (confirm(__("Activate selected profile?"))) { Notify.progress("Loading, please wait..."); - xhrPost("backend.php", {op: "pref-prefs", method: "activateprofile", id: sel_rows.toString()}, () => { + xhr.post("backend.php", {op: "pref-prefs", method: "activateprofile", id: sel_rows.toString()}, () => { window.location.reload(); }); } @@ -217,7 +217,7 @@ const Helpers = { const dialog = new fox.SingleUseDialog({ title: __("Customize stylesheet"), apply: function() { - xhrPost("backend.php", this.attr('value'), () => { + xhr.post("backend.php", this.attr('value'), () => { Element.show("css_edit_apply_msg"); App.byId("user_css_style").innerText = this.attr('value'); }); @@ -225,7 +225,7 @@ const Helpers = { execute: function () { Notify.progress('Saving data...', true); - xhrPost("backend.php", this.attr('value'), () => { + xhr.post("backend.php", this.attr('value'), () => { window.location.reload(); }); }, @@ -277,7 +277,7 @@ const Helpers = { if (confirm(__("Clear stored data for this plugin?"))) { Notify.progress("Loading, please wait..."); - xhrPost("backend.php", {op: "pref-prefs", method: "clearplugindata", name: name}, () => { + xhr.post("backend.php", {op: "pref-prefs", method: "clearplugindata", name: name}, () => { Helpers.Prefs.refresh(); }); } diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js index 9d16a147c..5e024afde 100644 --- a/js/PrefLabelTree.js +++ b/js/PrefLabelTree.js @@ -1,5 +1,5 @@ /* eslint-disable prefer-rest-params */ -/* global __, define, lib, dijit, dojo, xhrPost, Notify, fox, App */ +/* global __, define, lib, dijit, dojo, xhr, Notify, fox, App */ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/form/DropDownButton"], function (declare, domConstruct) { @@ -98,7 +98,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f ids: id, fg: fg, bg: bg, color: color }; - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { const tree = dijit.byId("filterTree"); if (tree) tree.reload(); // maybe there's labels in there }); @@ -114,7 +114,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f this.setLabelColor(id, fg_color, bg_color); this.hide(); - xhrPost("backend.php", this.attr('value'), () => { + xhr.post("backend.php", this.attr('value'), () => { const tree = dijit.byId("filterTree"); if (tree) tree.reload(); // maybe there's labels in there }); @@ -196,7 +196,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f ids: labels.toString() }; - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { this.reload(); }); } @@ -217,7 +217,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f ids: sel_rows.toString() }; - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { this.reload(); }); } diff --git a/js/PrefUsers.js b/js/PrefUsers.js index 5b490a2a5..9b9c1deaf 100644 --- a/js/PrefUsers.js +++ b/js/PrefUsers.js @@ -1,7 +1,7 @@ 'use strict' /* global __ */ -/* global xhrPost, xhrJson, dijit, Notify, Tables, App, fox */ +/* global xhrPost, xhr, dijit, Notify, Tables, App, fox */ const Users = { reload: function(sort) { @@ -38,7 +38,7 @@ const Users = { if (this.validate()) { Notify.progress("Saving data...", true); - xhrPost("backend.php", this.attr('value'), () => { + xhr.post("backend.php", this.attr('value'), () => { dialog.hide(); Users.reload(); }); @@ -160,7 +160,7 @@ const Users = { ids: sel_rows.toString() }; - xhrPost("backend.php", query, () => { + xhr.post("backend.php", query, () => { this.reload(); }); } diff --git a/js/common.js b/js/common.js index f3fcdd905..1c9a0453c 100755 --- a/js/common.js +++ b/js/common.js @@ -140,7 +140,6 @@ String.prototype.stripTags = function() { } /* exported xhr */ - const xhr = { post: function(url, params = {}, complete = undefined) { console.log('xhr.post', '>>>', params); -- cgit v1.2.3-54-g00ecf From 660a1bbe011fef5f0fa6bb0af43521fed7598cc7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 19 Feb 2021 13:44:56 +0300 Subject: * switch to xhr.post() almost everywhere * call App.handlerpcjson() automatically on json request (if possible) * show net/log indicators in prefs --- classes/pref/feeds.php | 3 +- classes/pref/prefs.php | 42 ++++++------- classes/rpc.php | 8 +++ js/App.js | 134 ++++++++++++++++++++-------------------- js/CommonDialogs.js | 4 +- js/CommonFilters.js | 28 ++++----- js/Feeds.js | 20 +++--- js/Headlines.js | 34 ++++------ js/PrefFeedTree.js | 8 +-- js/PrefFilterTree.js | 6 +- js/PrefHelpers.js | 29 +++++---- js/PrefLabelTree.js | 4 +- js/PrefUsers.js | 16 ++--- js/common.js | 5 +- js/prefs.js | 1 + plugins/af_proxy_http/init.php | 4 +- plugins/af_psql_trgm/init.js | 6 +- plugins/af_psql_trgm/init.php | 4 +- plugins/af_readability/init.php | 4 +- plugins/af_redditimgur/init.php | 4 +- plugins/mail/init.php | 4 +- plugins/mail/mail.js | 6 +- plugins/mailto/init.js | 6 +- plugins/note/note.js | 6 +- plugins/nsfw/init.php | 4 +- plugins/share/share.js | 10 +-- plugins/share/share_prefs.js | 6 +- prefs.php | 5 +- themes/compact.css | 11 ++++ themes/compact_night.css | 11 ++++ themes/light.css | 11 ++++ themes/light/tt-rss.less | 13 ++++ themes/night.css | 11 ++++ themes/night_blue.css | 11 ++++ 34 files changed, 275 insertions(+), 204 deletions(-) (limited to 'js/common.js') diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 761a0a087..97c529d07 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -832,8 +832,7 @@ class Pref_Feeds extends Handler_Protected { print " "; - print_feed_cat_select("cat_id", false, - 'disabled="1" dojoType="fox.form.Select"'); + print \Controls\select_feeds_cats("cat_id", null, ['disabled' => '1']); $this->batch_edit_cbox("cat_id"); diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index fecec6d91..2ea2e9f01 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -295,8 +295,8 @@ class Pref_Prefs extends Handler_Protected { evt.preventDefault(); if (this.validate()) { Notify.progress('Saving data...', true); - xhrPost("backend.php", this.getValues(), (transport) => { - Notify.info(transport.responseText); + xhr.post("backend.php", this.getValues(), (reply) => { + Notify.info(reply); }) } @@ -351,16 +351,16 @@ class Pref_Prefs extends Handler_Protected { evt.preventDefault(); if (this.validate()) { Notify.progress('Saving data...', true); - xhrPost("backend.php", this.getValues(), (transport) => { + xhr.post("backend.php", this.getValues(), (reply) => { Notify.close(); - if (transport.responseText.indexOf('ERROR: ') == 0) { + if (reply.indexOf('ERROR: ') == 0) { App.byId('pwd_change_infobox').innerHTML = - transport.responseText.replace('ERROR: ', ''); + reply.replace('ERROR: ', ''); } else { App.byId('pwd_change_infobox').innerHTML = - transport.responseText.replace('ERROR: ', ''); + reply.replace('ERROR: ', ''); const warn = App.byId('default_pass_warning'); if (warn) Element.hide(warn); @@ -456,11 +456,11 @@ class Pref_Prefs extends Handler_Protected { evt.preventDefault(); if (this.validate()) { Notify.progress('Saving data...', true); - xhrPost("backend.php", this.getValues(), (transport) => { + xhr.post("backend.php", this.getValues(), (reply) => { Notify.close(); - if (transport.responseText.indexOf('ERROR: ') == 0) { - Notify.error(transport.responseText.replace('ERROR: ', '')); + if (reply.indexOf('ERROR: ') == 0) { + Notify.error(reply.replace('ERROR: ', '')); } else { window.location.reload(); } @@ -515,11 +515,11 @@ class Pref_Prefs extends Handler_Protected { evt.preventDefault(); if (this.validate()) { Notify.progress('Saving data...', true); - xhrPost("backend.php", this.getValues(), (transport) => { + xhr.post("backend.php", this.getValues(), (reply) => { Notify.close(); - if (transport.responseText.indexOf('ERROR:') == 0) { - Notify.error(transport.responseText.replace('ERROR:', '')); + if (reply.indexOf('ERROR:') == 0) { + Notify.error(reply.replace('ERROR:', '')); } else { window.location.reload(); } @@ -797,16 +797,14 @@ class Pref_Prefs extends Handler_Protected { @@ -1023,8 +1021,8 @@ class Pref_Prefs extends Handler_Protected { diff --git a/classes/rpc.php b/classes/rpc.php index 0fd06da4d..c4a1887c7 100755 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -64,6 +64,14 @@ class RPC extends Handler_Protected { print json_encode(array("message" => "UPDATE_COUNTERS")); } + function getRuntimeInfo() { + $reply = [ + 'runtime-info' => $this->make_runtime_info() + ]; + + print json_encode($reply); + } + function getAllCounters() { @$seq = (int) $_REQUEST['seq']; diff --git a/js/App.js b/js/App.js index 1b0fa7c65..544057101 100644 --- a/js/App.js +++ b/js/App.js @@ -2,7 +2,7 @@ /* eslint-disable new-cap */ /* global __, Article, Headlines, Filters, fox */ -/* global xhrPost, xhr, dojo, dijit, PluginHost, Notify, Feeds, Cookie */ +/* global xhr, dojo, dijit, PluginHost, Notify, Feeds, Cookie */ /* global CommonDialogs, Plugins */ const App = { @@ -371,72 +371,57 @@ const App = { dialog.show(); }); }, - handleRpcJson: function(transport) { + handleRpcJson: function(reply) { - const netalert = App.findAll("#toolbar .net-alert")[0]; + const netalert = App.find(".net-alert"); - try { - const reply = JSON.parse(transport.responseText); - - if (reply) { - const error = reply['error']; - - if (error) { - const code = error['code']; - const msg = error['message']; - - console.warn("[handleRpcJson] received fatal error ", code, msg); - - if (code != 0) { - /* global ERRORS */ - this.Error.fatal(ERRORS[code], {info: msg, code: code}); - return false; - } - } + if (reply) { + const error = reply['error']; + const seq = reply['seq']; + const message = reply['message']; + const counters = reply['counters']; + const runtime_info = reply['runtime-info']; - const seq = reply['seq']; + if (error) { + const code = error['code']; - if (seq && this.get_seq() != seq) { - console.log("[handleRpcJson] sequence mismatch: ", seq, '!=', this.get_seq()); - return true; - } - - const message = reply['message']; - - if (message == "UPDATE_COUNTERS") { - console.log("need to refresh counters..."); - Feeds.requestCounters(true); - } + if (code && code != 0) { + const msg = error['message']; - const counters = reply['counters']; + console.warn("[handleRpcJson] received fatal error ", code, msg); - if (counters) - Feeds.parseCounters(counters); - - const runtime_info = reply['runtime-info']; - - if (runtime_info) - this.parseRuntimeInfo(runtime_info); + /* global ERRORS */ + this.Error.fatal(ERRORS[code], {info: msg, code: code}); + return false; + } + } - if (netalert) netalert.hide(); + if (seq && this.get_seq() != seq) { + console.warn("[handleRpcJson] sequence mismatch: ", seq, '!=', this.get_seq()); + return; + } - return reply; + // not in preferences + if (typeof Feeds != "undefined") { + if (message == "UPDATE_COUNTERS") { + console.log("need to refresh counters..."); + Feeds.requestCounters(true); + } - } else { - if (netalert) netalert.show(); + if (counters) + Feeds.parseCounters(counters); + } - Notify.error("Communication problem with server."); - } + if (runtime_info) + this.parseRuntimeInfo(runtime_info); - } catch (e) { - if (netalert) netalert.show(); + if (netalert) netalert.hide(); - Notify.error("Communication problem with server."); + } else { + if (netalert) netalert.show(); - console.error(e); + Notify.error("Communication problem with server."); } - - return false; }, parseRuntimeInfo: function(data) { Object.keys(data).forEach((k) => { @@ -450,7 +435,7 @@ const App = { } if (k == "recent_log_events") { - const alert = App.findAll(".log-alert")[0]; + const alert = App.find(".log-alert"); if (alert) { v > 0 ? alert.show() : alert.hide(); @@ -462,10 +447,12 @@ const App = { return; } - if (k == "max_feed_id" || k == "num_feeds") { - if (this.getInitParam(k) != v) { - console.log("feed count changed, need to reload feedlist."); - Feeds.reload(); + if (typeof Feeds != "undefined") { + if (k == "max_feed_id" || k == "num_feeds") { + if (this.getInitParam(k) && this.getInitParam(k) != v) { + console.log("feed count changed, need to reload feedlist:", this.getInitParam(k), v); + Feeds.reload(); + } } } @@ -668,6 +655,11 @@ const App = { return errorMsg == ""; }, + updateRuntimeInfo: function() { + xhr.json("backend.php", {op: "rpc", method: "getruntimeinfo"}, () => { + // handled by xhr.json() + }); + }, initSecondStage: function() { document.onkeydown = (event) => this.hotkeyHandler(event); @@ -685,14 +677,18 @@ const App = { if (tab) { dijit.byId("pref-tabs").selectChild(tab); - switch (this.urlParam('method')) { - case "editfeed": - window.setTimeout(() => { - CommonDialogs.editFeed(this.urlParam('methodparam')) - }, 100); - break; - default: - console.warn("initSecondStage, unknown method:", this.urlParam("method")); + const method = this.urlParam("method"); + + if (method) { + switch (method) { + case "editfeed": + window.setTimeout(() => { + CommonDialogs.editFeed(this.urlParam('methodparam')) + }, 100); + break; + default: + console.warn("initSecondStage, unknown method:", method); + } } } } else { @@ -708,8 +704,14 @@ const App = { dojo.connect(dijit.byId("pref-tabs"), "selectChild", function (elem) { localStorage.setItem("ttrss:prefs-tab", elem.id); + App.updateRuntimeInfo(); }); + if (!this.getInitParam("bw_limit")) + window.setInterval(() => { + App.updateRuntimeInfo(); + }, 60 * 1000) + } else { Feeds.reload(); diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js index 516da5c98..a75b36ed8 100644 --- a/js/CommonDialogs.js +++ b/js/CommonDialogs.js @@ -430,8 +430,8 @@ const CommonDialogs = { const tmph = dojo.connect(dialog, 'onShow', function () { dojo.disconnect(tmph); - xhrPost("backend.php", {op: "pref-feeds", method: "editfeed", id: feed}, (transport) => { - dialog.attr('content', transport.responseText); + xhr.post("backend.php", {op: "pref-feeds", method: "editfeed", id: feed}, (reply) => { + dialog.attr('content', reply); }) }); diff --git a/js/CommonFilters.js b/js/CommonFilters.js index 9cc93d7b8..0fc8f87ae 100644 --- a/js/CommonFilters.js +++ b/js/CommonFilters.js @@ -39,12 +39,12 @@ const Filters = { createNewRuleElement: function(parentNode, replaceNode) { const rule = dojo.formToJson("filter_new_rule_form"); - xhrPost("backend.php", {op: "pref-filters", method: "printrulename", rule: rule}, (transport) => { + xhr.post("backend.php", {op: "pref-filters", method: "printrulename", rule: rule}, (reply) => { try { const li = document.createElement('li'); li.innerHTML = ` - ${transport.responseText} + ${reply} ${App.FormFields.hidden_tag("rule[]", rule)}`; dojo.parser.parse(li); @@ -70,12 +70,12 @@ const Filters = { const action = dojo.formToJson(form); - xhrPost("backend.php", { op: "pref-filters", method: "printactionname", action: action }, (transport) => { + xhr.post("backend.php", { op: "pref-filters", method: "printactionname", action: action }, (reply) => { try { const li = document.createElement('li'); li.innerHTML = ` - ${transport.responseText} + ${reply} ${App.FormFields.hidden_tag("action[]", action)}`; dojo.parser.parse(li); @@ -107,8 +107,8 @@ const Filters = { const tmph = dojo.connect(dialog, "onShow", null, function (/* e */) { dojo.disconnect(tmph); - xhrPost("backend.php", {op: 'pref-filters', method: 'newrule', rule: ruleStr}, (transport) => { - dialog.attr('content', transport.responseText); + xhr.post("backend.php", {op: 'pref-filters', method: 'newrule', rule: ruleStr}, (reply) => { + dialog.attr('content', reply); }); }); @@ -128,8 +128,8 @@ const Filters = { const tmph = dojo.connect(dialog, "onShow", null, function (/* e */) { dojo.disconnect(tmph); - xhrPost("backend.php", {op: 'pref-filters', method: 'newaction', action: actionStr}, (transport) => { - dialog.attr('content', transport.responseText); + xhr.post("backend.php", {op: 'pref-filters', method: 'newaction', action: actionStr}, (reply) => { + dialog.attr('content', reply); }); }); @@ -149,10 +149,8 @@ const Filters = { console.log("getTestResults:" + offset); - xhrPost("backend.php", params, (transport) => { + xhr.json("backend.php", params, (result) => { try { - const result = JSON.parse(transport.responseText); - if (result && dialog && dialog.open) { dialog.results += result.length; @@ -239,7 +237,7 @@ const Filters = { console.log('Filters.edit', query); - xhrPost("backend.php", query, function (transport) { + xhr.post("backend.php", query, function (reply) { try { const dialog = new fox.SingleUseDialog({ id: "filterEditDlg", @@ -311,7 +309,7 @@ const Filters = { }); } }, - content: transport.responseText + content: reply }); if (!App.isPrefs()) { @@ -334,9 +332,7 @@ const Filters = { const query = {op: "article", method: "getmetadatabyid", id: Article.getActive()}; - xhrPost("backend.php", query, (transport) => { - const reply = JSON.parse(transport.responseText); - + xhr.json("backend.php", query, (reply) => { let title = false; if (reply && reply.title) title = reply.title; diff --git a/js/Feeds.js b/js/Feeds.js index e9681953e..01d31f3c1 100644 --- a/js/Feeds.js +++ b/js/Feeds.js @@ -130,8 +130,8 @@ const Feeds = { this.reloadCurrent(); }, requestCounters: function() { - xhrPost("backend.php", {op: "rpc", method: "getAllCounters", seq: App.next_seq()}, (transport) => { - App.handleRpcJson(transport); + xhr.json("backend.php", {op: "rpc", method: "getAllCounters", seq: App.next_seq()}, () => { + // }); }, reload: function() { @@ -260,7 +260,7 @@ const Feeds = { // bw_limit disables timeout() so we request initial counters separately if (App.getInitParam("bw_limit")) { - this.requestCounters(true); + App.requestCounters(true); } else { setTimeout(() => { this.requestCounters(true); @@ -361,8 +361,6 @@ const Feeds = { query.m = "ForceUpdate"; } - //Form.enable("toolbar-main"); - if (!delayed) if (!this.setExpando(feed, is_cat, (is_cat) ? 'images/indicator_tiny.gif' : 'images/indicator_white.gif')) @@ -374,11 +372,11 @@ const Feeds = { window.clearTimeout(this._viewfeed_wait_timeout); this._viewfeed_wait_timeout = window.setTimeout(() => { - xhrPost("backend.php", query, (transport) => { + xhr.json("backend.php", query, (reply) => { try { window.clearTimeout(this._infscroll_timeout); this.setExpando(feed, is_cat, 'images/blank_icon.gif'); - Headlines.onLoaded(transport, offset, append); + Headlines.onLoaded(reply, offset, append); PluginHost.run(PluginHost.HOOK_FEED_LOADED, [feed, is_cat]); } catch (e) { App.Error.report(e); @@ -439,9 +437,7 @@ const Feeds = { Notify.progress("Loading, please wait...", true); - xhrPost("backend.php", catchup_query, (transport) => { - App.handleRpcJson(transport); - + xhr.json("backend.php", catchup_query, () => { const show_next_feed = App.getInitParam("on_catchup_show_next_feed"); // only select next unread feed if catching up entirely (as opposed to last week etc) @@ -633,8 +629,8 @@ const Feeds = { updateRandom: function() { console.log("in update_random_feed"); - xhrPost("backend.php", {op: "rpc", method: "updaterandomfeed"}, (transport) => { - App.handleRpcJson(transport, true); + xhr.json("backend.php", {op: "rpc", method: "updaterandomfeed"}, () => { + // }); }, }; diff --git a/js/Headlines.js b/js/Headlines.js index 34dc9385e..18e0a3687 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -1,7 +1,7 @@ 'use strict'; /* global __, ngettext, Article, App */ -/* global xhrPost, dojo, dijit, PluginHost, Notify, $$, Feeds */ +/* global dojo, dijit, PluginHost, Notify, xhr, Feeds */ /* global CommonDialogs */ const Headlines = { @@ -149,26 +149,26 @@ const Headlines = { const promises = []; if (ops.tmark.length != 0) - promises.push(xhrPost("backend.php", + promises.push(xhr.post("backend.php", {op: "rpc", method: "markSelected", ids: ops.tmark.toString(), cmode: 2})); if (ops.tpub.length != 0) - promises.push(xhrPost("backend.php", + promises.push(xhr.post("backend.php", {op: "rpc", method: "publishSelected", ids: ops.tpub.toString(), cmode: 2})); if (ops.read.length != 0) - promises.push(xhrPost("backend.php", + promises.push(xhr.post("backend.php", {op: "rpc", method: "catchupSelected", ids: ops.read.toString(), cmode: 0})); if (ops.unread.length != 0) - promises.push(xhrPost("backend.php", + promises.push(xhr.post("backend.php", {op: "rpc", method: "catchupSelected", ids: ops.unread.toString(), cmode: 1})); const scores = Object.keys(ops.rescore); if (scores.length != 0) { scores.forEach((score) => { - promises.push(xhrPost("backend.php", + promises.push(xhr.post("backend.php", {op: "article", method: "setScore", id: ops.rescore[score].toString(), score: score})); }); } @@ -622,9 +622,7 @@ const Headlines = { dojo.parser.parse(target.domNode); }, - onLoaded: function (transport, offset, append) { - const reply = App.handleRpcJson(transport); - + onLoaded: function (reply, offset, append) { console.log("Headlines.onLoaded: offset=", offset, "append=", append); let is_cat = false; @@ -785,7 +783,6 @@ const Headlines = { }); } else { - console.error("Invalid object received: " + transport.responseText); dijit.byId("headlines-frame").attr('content', "
" + __('Could not update headlines (invalid object received - see error console for details)') + "
"); @@ -1011,9 +1008,8 @@ const Headlines = { ids: ids.toString(), lid: id }; - xhrPost("backend.php", query, (transport) => { - App.handleRpcJson(transport); - this.onLabelsUpdated(transport); + xhr.json("backend.php", query, (reply) => { + this.onLabelsUpdated(reply); }); }, selectionAssignLabel: function (id, ids) { @@ -1029,9 +1025,8 @@ const Headlines = { ids: ids.toString(), lid: id }; - xhrPost("backend.php", query, (transport) => { - App.handleRpcJson(transport); - this.onLabelsUpdated(transport); + xhr.json("backend.php", query, (reply) => { + this.onLabelsUpdated(reply); }); }, deleteSelection: function () { @@ -1060,8 +1055,7 @@ const Headlines = { const query = {op: "rpc", method: "delete", ids: rows.toString()}; - xhrPost("backend.php", query, (transport) => { - App.handleRpcJson(transport); + xhr.json("backend.php", query, () => { Feeds.reloadCurrent(); }); }, @@ -1246,9 +1240,7 @@ const Headlines = { } } }, - onLabelsUpdated: function (transport) { - const data = JSON.parse(transport.responseText); - + onLabelsUpdated: function (data) { if (data) { data['info-for-headlines'].forEach(function (elem) { App.findAll(".HLLCTR-" + elem.id).forEach(function (ctr) { diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js index d3a4cd33d..a2a7f9141 100644 --- a/js/PrefFeedTree.js +++ b/js/PrefFeedTree.js @@ -129,8 +129,8 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b const searchElem = App.byId("feed_search"); const search = (searchElem) ? searchElem.value : ""; - xhrPost("backend.php", { op: "pref-feeds", search: search }, (transport) => { - dijit.byId('feedsTab').attr('content', transport.responseText); + xhr.post("backend.php", { op: "pref-feeds", search: search }, (reply) => { + dijit.byId('feedsTab').attr('content', reply); Notify.close(); }); }, @@ -295,7 +295,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b Notify.progress("Loading, please wait..."); - xhrPost("backend.php", {op: "pref-feeds", method: "editfeeds", ids: rows.toString()}, (transport) => { + xhr.post("backend.php", {op: "pref-feeds", method: "editfeeds", ids: rows.toString()}, (reply) => { Notify.close(); try { @@ -347,7 +347,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b }); } }, - content: transport.responseText + content: reply }); dialog.show(); diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js index cc37808be..fff58ff1a 100644 --- a/js/PrefFilterTree.js +++ b/js/PrefFilterTree.js @@ -1,5 +1,5 @@ /* eslint-disable prefer-rest-params */ -/* global __, define, lib, dijit, dojo, xhr, Notify */ +/* global __, define, lib, dijit, dojo, xhr, App, Notify */ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], function (declare, domConstruct) { @@ -91,8 +91,8 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio let search = ""; if (user_search) { search = user_search.value; } - xhrPost("backend.php", { op: "pref-filters", search: search }, (transport) => { - dijit.byId('filtersTab').attr('content', transport.responseText); + xhr.post("backend.php", { op: "pref-filters", search: search }, (reply) => { + dijit.byId('filtersTab').attr('content', reply); Notify.close(); }); }, diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js index abf5fff51..d27e0e071 100644 --- a/js/PrefHelpers.js +++ b/js/PrefHelpers.js @@ -19,8 +19,8 @@ const Helpers = { alert("No passwords selected."); } else if (confirm(__("Remove selected app passwords?"))) { - xhrPost("backend.php", {op: "pref-prefs", method: "deleteAppPassword", ids: rows.toString()}, (transport) => { - this.updateContent(transport.responseText); + xhr.post("backend.php", {op: "pref-prefs", method: "deleteAppPassword", ids: rows.toString()}, (reply) => { + this.updateContent(reply); Notify.close(); }); @@ -31,8 +31,8 @@ const Helpers = { const title = prompt("Password description:") if (title) { - xhrPost("backend.php", {op: "pref-prefs", method: "generateAppPassword", title: title}, (transport) => { - this.updateContent(transport.responseText); + xhr.post("backend.php", {op: "pref-prefs", method: "generateAppPassword", title: title}, (reply) => { + this.updateContent(reply); Notify.close(); }); @@ -63,8 +63,13 @@ const Helpers = { this.update(); }, update: function() { - xhrPost("backend.php", { op: "pref-system", severity: dijit.byId("severity").attr('value'), page: Helpers.EventLog.log_page }, (transport) => { - dijit.byId('systemTab').attr('content', transport.responseText); + xhr.post("backend.php", { + op: "pref-system", + severity: dijit.byId("severity").attr('value'), + page: Helpers.EventLog.log_page + }, (reply) => { + + dijit.byId('systemTab').attr('content', reply); Notify.close(); }); }, @@ -164,8 +169,8 @@ const Helpers = { `${profile.title} @@ -267,9 +272,9 @@ const Helpers = { }, confirmReset: function() { if (confirm(__("Reset to defaults?"))) { - xhrPost("backend.php", {op: "pref-prefs", method: "resetconfig"}, (transport) => { + xhr.post("backend.php", {op: "pref-prefs", method: "resetconfig"}, (reply) => { Helpers.Prefs.refresh(); - Notify.info(transport.responseText); + Notify.info(reply); }); } }, @@ -283,8 +288,8 @@ const Helpers = { } }, refresh: function() { - xhrPost("backend.php", { op: "pref-prefs" }, (transport) => { - dijit.byId('prefsTab').attr('content', transport.responseText); + xhr.post("backend.php", { op: "pref-prefs" }, (reply) => { + dijit.byId('prefsTab').attr('content', reply); Notify.close(); }); }, diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js index 5e024afde..627b2cfbe 100644 --- a/js/PrefLabelTree.js +++ b/js/PrefLabelTree.js @@ -55,8 +55,8 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f return rv; }, reload: function() { - xhrPost("backend.php", { op: "pref-labels" }, (transport) => { - dijit.byId('labelsTab').attr('content', transport.responseText); + xhr.post("backend.php", { op: "pref-labels" }, (reply) => { + dijit.byId('labelsTab').attr('content', reply); Notify.close(); }); }, diff --git a/js/PrefUsers.js b/js/PrefUsers.js index 9b9c1deaf..3eb83b02a 100644 --- a/js/PrefUsers.js +++ b/js/PrefUsers.js @@ -8,8 +8,8 @@ const Users = { const user_search = App.byId("user_search"); const search = user_search ? user_search.value : ""; - xhrPost("backend.php", { op: "pref-users", sort: sort, search: search }, (transport) => { - dijit.byId('usersTab').attr('content', transport.responseText); + xhr.post("backend.php", { op: "pref-users", sort: sort, search: search }, (reply) => { + dijit.byId('usersTab').attr('content', reply); Notify.close(); }); }, @@ -19,8 +19,8 @@ const Users = { if (login) { Notify.progress("Adding user..."); - xhrPost("backend.php", {op: "pref-users", method: "add", login: login}, (transport) => { - alert(transport.responseText); + xhr.post("backend.php", {op: "pref-users", method: "add", login: login}, (reply) => { + alert(reply); Users.reload(); }); @@ -99,8 +99,8 @@ const Users = {
@@ -141,9 +141,9 @@ const Users = { const id = rows[0]; - xhrPost("backend.php", {op: "pref-users", method: "resetPass", id: id}, (transport) => { + xhr.post("backend.php", {op: "pref-users", method: "resetPass", id: id}, (reply) => { Notify.close(); - Notify.info(transport.responseText, true); + Notify.info(reply, true); }); } diff --git a/js/common.js b/js/common.js index 1c9a0453c..e88b62602 100755 --- a/js/common.js +++ b/js/common.js @@ -155,7 +155,7 @@ const xhr = { reject(error); }, load: function(data, ioargs) { - //console.log('xhr.post', '<<<', data, ioargs); + console.log('xhr.post', '<<<', ioargs.xhr); if (complete != undefined) complete(data, ioargs.xhr); @@ -179,6 +179,9 @@ const xhr = { console.log('xhr.json', '<<<', obj); + if (obj && typeof App != "undefined") + App.handleRpcJson(obj); + if (complete != undefined) complete(obj); resolve(obj); diff --git a/js/prefs.js b/js/prefs.js index 803a7edf3..a23a74856 100755 --- a/js/prefs.js +++ b/js/prefs.js @@ -41,6 +41,7 @@ require(["dojo/_base/kernel", "dojo/data/ItemFileWriteStore", "lib/CheckBoxStoreModel", "lib/CheckBoxTree", + "fox/PluginHost", "fox/CommonDialogs", "fox/CommonFilters", "fox/PrefUsers", diff --git a/plugins/af_proxy_http/init.php b/plugins/af_proxy_http/init.php index 2c472a32d..a5ba1d62d 100644 --- a/plugins/af_proxy_http/init.php +++ b/plugins/af_proxy_http/init.php @@ -221,8 +221,8 @@ class Af_Proxy_Http extends Plugin { diff --git a/plugins/af_psql_trgm/init.js b/plugins/af_psql_trgm/init.js index e5bc21885..921272c4b 100644 --- a/plugins/af_psql_trgm/init.js +++ b/plugins/af_psql_trgm/init.js @@ -1,4 +1,4 @@ -/* global dijit, dojo, Plugins, xhrPost, __ */ +/* global dijit, dojo, Plugins, xhr, __ */ Plugins.Psql_Trgm = { showRelated: function (id) { @@ -10,8 +10,8 @@ Plugins.Psql_Trgm = { const tmph = dojo.connect(dialog, "onShow", null, function (/* e */) { dojo.disconnect(tmph); - xhrPost("backend.php", {op: 'pluginhandler', plugin: 'af_psql_trgm', method: 'showrelated', id: id}, (transport) => { - dialog.attr('content', transport.responseText); + xhr.post("backend.php", {op: 'pluginhandler', plugin: 'af_psql_trgm', method: 'showrelated', id: id}, (reply) => { + dialog.attr('content', reply); }); }); diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index 4ecfe0cd5..3b7ed6b14 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -152,8 +152,8 @@ class Af_Psql_Trgm extends Plugin { evt.preventDefault(); if (this.validate()) { Notify.progress('Saving data...', true); - xhrPost("backend.php", this.getValues(), (transport) => { - Notify.info(transport.responseText); + xhr.post("backend.php", this.getValues(), (reply) => { + Notify.info(reply); }) } diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php index 4cd72904a..be9220cda 100755 --- a/plugins/af_readability/init.php +++ b/plugins/af_readability/init.php @@ -71,8 +71,8 @@ class Af_Readability extends Plugin { evt.preventDefault(); if (this.validate()) { Notify.progress('Saving data...', true); - xhrPost("backend.php", this.getValues(), (transport) => { - Notify.info(transport.responseText); + xhr.post("backend.php", this.getValues(), (reply) => { + Notify.info(reply); }) } diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php index 827a4c310..2677fdd90 100755 --- a/plugins/af_redditimgur/init.php +++ b/plugins/af_redditimgur/init.php @@ -47,8 +47,8 @@ class Af_RedditImgur extends Plugin { evt.preventDefault(); if (this.validate()) { Notify.progress('Saving data...', true); - xhrPost("backend.php", this.getValues(), (transport) => { - Notify.info(transport.responseText); + xhr.post("backend.php", this.getValues(), (reply) => { + Notify.info(reply); }) } diff --git a/plugins/mail/init.php b/plugins/mail/init.php index 16e22f342..467f8294a 100644 --- a/plugins/mail/init.php +++ b/plugins/mail/init.php @@ -51,8 +51,8 @@ class Mail extends Plugin { evt.preventDefault(); if (this.validate()) { Notify.progress('Saving data...', true); - xhrPost("backend.php", this.getValues(), (transport) => { - Notify.info(transport.responseText); + xhr.post("backend.php", this.getValues(), (reply) => { + Notify.info(reply); }) } diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js index fc0898085..d2bafe0e9 100644 --- a/plugins/mail/mail.js +++ b/plugins/mail/mail.js @@ -1,4 +1,4 @@ -/* global Plugins, Headlines, dojo, xhrPost, xhrJson, Notify, fox, __ */ +/* global Plugins, Headlines, dojo, App, xhr, Notify, fox, __ */ Plugins.Mail = { send: function(id) { @@ -38,8 +38,8 @@ Plugins.Mail = { const tmph = dojo.connect(dialog, 'onShow', function () { dojo.disconnect(tmph); - xhrPost("backend.php", App.getPhArgs("mail", "emailArticle", {ids: id}), (transport) => { - dialog.attr('content', transport.responseText); + xhr.post("backend.php", App.getPhArgs("mail", "emailArticle", {ids: id}), (reply) => { + dialog.attr('content', reply); }); }); diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js index b5e68680b..4a9557249 100644 --- a/plugins/mailto/init.js +++ b/plugins/mailto/init.js @@ -1,4 +1,4 @@ -/* global Plugins, Headlines, xhrPost, dojo, fox, __ */ +/* global Plugins, Headlines, xhr, dojo, fox, __ */ Plugins.Mailto = { send: function (id) { @@ -21,8 +21,8 @@ Plugins.Mailto = { const tmph = dojo.connect(dialog, 'onShow', function () { dojo.disconnect(tmph); - xhrPost("backend.php", App.getPhArgs("mailto", "emailArticle", {ids: id}), (transport) => { - dialog.attr('content', transport.responseText); + xhr.post("backend.php", App.getPhArgs("mailto", "emailArticle", {ids: id}), (reply) => { + dialog.attr('content', reply); }); }); diff --git a/plugins/note/note.js b/plugins/note/note.js index 36bc426cd..d42fca2c1 100644 --- a/plugins/note/note.js +++ b/plugins/note/note.js @@ -1,4 +1,4 @@ -/* global dojo, xhrPost, Plugins, xhrJson, Notify, fox, __ */ +/* global dojo, Plugins, xhr, App, Notify, fox, __ */ Plugins.Note = { edit: function(id) { @@ -33,8 +33,8 @@ Plugins.Note = { const tmph = dojo.connect(dialog, 'onShow', function () { dojo.disconnect(tmph); - xhrPost("backend.php", App.getPhArgs("note", "edit", {id: id}), (transport) => { - dialog.attr('content', transport.responseText); + xhr.post("backend.php", App.getPhArgs("note", "edit", {id: id}), (reply) => { + dialog.attr('content', reply); }); }); diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php index fdc6a3974..3205b436b 100644 --- a/plugins/nsfw/init.php +++ b/plugins/nsfw/init.php @@ -56,8 +56,8 @@ class NSFW extends Plugin { evt.preventDefault(); if (this.validate()) { Notify.progress('Saving data...', true); - xhrPost("backend.php", this.getValues(), (transport) => { - Notify.info(transport.responseText); + xhr.post("backend.php", this.getValues(), (reply) => { + Notify.info(reply); }) } diff --git a/plugins/share/share.js b/plugins/share/share.js index d7b8cd1f9..1be9db682 100644 --- a/plugins/share/share.js +++ b/plugins/share/share.js @@ -1,4 +1,4 @@ -/* global dojo, Effect, Plugins, xhrJson, Notify, fox, xhrPost, __ */ +/* global dojo, Plugins, App, Notify, fox, xhr, __ */ Plugins.Share = { shareArticle: function(id) { @@ -40,8 +40,8 @@ Plugins.Share = { }, unshare: function () { if (confirm(__("Remove sharing for this article?"))) { - xhrPost("backend.php", App.getPhArgs("share", "unshare", {id: id}), (transport) => { - Notify.info(transport.responseText); + xhr.post("backend.php", App.getPhArgs("share", "unshare", {id: id}), (reply) => { + Notify.info(reply); const icon = document.querySelector(".share-icon-" + id); @@ -59,8 +59,8 @@ Plugins.Share = { const tmph = dojo.connect(dialog, 'onShow', function () { dojo.disconnect(tmph); - xhrPost("backend.php", App.getPhArgs("share", "shareDialog", {id: id}), (transport) => { - dialog.attr('content', transport.responseText) + xhr.post("backend.php", App.getPhArgs("share", "shareDialog", {id: id}), (reply) => { + dialog.attr('content', reply) const icon = document.querySelector(".share-icon-" + id); diff --git a/plugins/share/share_prefs.js b/plugins/share/share_prefs.js index 91f979daf..d974af618 100644 --- a/plugins/share/share_prefs.js +++ b/plugins/share/share_prefs.js @@ -1,12 +1,12 @@ -/* global Plugins, Notify, xhrPost */ +/* global Plugins, Notify, xhr, App */ Plugins.Share = { clearKeys: function() { if (confirm(__("This will invalidate all previously shared article URLs. Continue?"))) { Notify.progress("Clearing URLs..."); - xhrPost("backend.php", App.getPhArgs("share", "clearArticleKeys"), (transport) => { - Notify.info(transport.responseText); + xhr.post("backend.php", App.getPhArgs("share", "clearArticleKeys"), (reply) => { + Notify.info(reply); }); } diff --git a/prefs.php b/prefs.php index 2b2af8452..d11c6281e 100644 --- a/prefs.php +++ b/prefs.php @@ -124,7 +124,10 @@
diff --git a/themes/compact.css b/themes/compact.css index 0116fa45b..e92db1659 100644 --- a/themes/compact.css +++ b/themes/compact.css @@ -754,6 +754,17 @@ body.ttrss_main #header { top: 0px; z-index: 5; } +body.ttrss_main #header i.net-alert, +body.ttrss_main #header .left i.icon-error { + color: red; +} +body.ttrss_main #header i.log-alert { + color: #ddba1c; + cursor: pointer; +} +body.ttrss_main #header i { + margin: 0 4px; +} body.ttrss_main #content-insert { padding: 0px; border-color: #ddd; diff --git a/themes/compact_night.css b/themes/compact_night.css index 2709cf196..42b850536 100644 --- a/themes/compact_night.css +++ b/themes/compact_night.css @@ -754,6 +754,17 @@ body.ttrss_main #header { top: 0px; z-index: 5; } +body.ttrss_main #header i.net-alert, +body.ttrss_main #header .left i.icon-error { + color: red; +} +body.ttrss_main #header i.log-alert { + color: #ddba1c; + cursor: pointer; +} +body.ttrss_main #header i { + margin: 0 4px; +} body.ttrss_main #content-insert { padding: 0px; border-color: #222; diff --git a/themes/light.css b/themes/light.css index 492daf08f..0b69ef84b 100644 --- a/themes/light.css +++ b/themes/light.css @@ -754,6 +754,17 @@ body.ttrss_main #header { top: 0px; z-index: 5; } +body.ttrss_main #header i.net-alert, +body.ttrss_main #header .left i.icon-error { + color: red; +} +body.ttrss_main #header i.log-alert { + color: #ddba1c; + cursor: pointer; +} +body.ttrss_main #header i { + margin: 0 4px; +} body.ttrss_main #content-insert { padding: 0px; border-color: #ddd; diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less index 3cf1a2d5e..b1895f318 100644 --- a/themes/light/tt-rss.less +++ b/themes/light/tt-rss.less @@ -877,6 +877,19 @@ body.ttrss_main { right : 0px; top : 0px; z-index : 5; + + i.net-alert, .left i.icon-error { + color : red; + } + + i.log-alert { + color : #ddba1c; + cursor : pointer; + } + + i { + margin : 0 4px; + } } #content-insert { diff --git a/themes/night.css b/themes/night.css index a52ef701d..65484b82b 100644 --- a/themes/night.css +++ b/themes/night.css @@ -755,6 +755,17 @@ body.ttrss_main #header { top: 0px; z-index: 5; } +body.ttrss_main #header i.net-alert, +body.ttrss_main #header .left i.icon-error { + color: red; +} +body.ttrss_main #header i.log-alert { + color: #ddba1c; + cursor: pointer; +} +body.ttrss_main #header i { + margin: 0 4px; +} body.ttrss_main #content-insert { padding: 0px; border-color: #222; diff --git a/themes/night_blue.css b/themes/night_blue.css index 2a7debf35..1c16a6f22 100644 --- a/themes/night_blue.css +++ b/themes/night_blue.css @@ -755,6 +755,17 @@ body.ttrss_main #header { top: 0px; z-index: 5; } +body.ttrss_main #header i.net-alert, +body.ttrss_main #header .left i.icon-error { + color: red; +} +body.ttrss_main #header i.log-alert { + color: #ddba1c; + cursor: pointer; +} +body.ttrss_main #header i { + margin: 0 4px; +} body.ttrss_main #content-insert { padding: 0px; border-color: #222; -- cgit v1.2.3-54-g00ecf From d445530fa08cdbe2088150a3e7d23596eab9b142 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 19 Feb 2021 17:15:22 +0300 Subject: format note on the client --- classes/article.php | 15 --------------- classes/feeds.php | 5 ----- js/Article.js | 7 ++++++- js/Headlines.js | 2 +- js/common.js | 4 ++-- plugins/note/init.php | 9 +++------ plugins/note/note.js | 14 ++++++-------- 7 files changed, 18 insertions(+), 38 deletions(-) (limited to 'js/common.js') diff --git a/classes/article.php b/classes/article.php index 1e90c843e..e64c17a32 100755 --- a/classes/article.php +++ b/classes/article.php @@ -419,21 +419,6 @@ class Article extends Handler_Protected { return $tags; } - static function _format_note_html($id, $note, $allow_edit = true) { - if ($allow_edit) { - $onclick = "onclick='Plugins.Note.edit($id)'"; - $note_class = 'editable'; - } else { - $onclick = ''; - $note_class = ''; - } - - return "
- note -
$note
-
"; - } - function getmetadatabyid() { $id = clean($_REQUEST['id']); diff --git a/classes/feeds.php b/classes/feeds.php index 5ad21ded9..b95ade2f5 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -260,11 +260,6 @@ class Feeds extends Handler_Protected { $this->_mark_timestamp(" disk_cache_rewrite"); - if ($line['note']) - $line['note'] = Article::_format_note_html($id, $line['note']); - else - $line['note'] = ""; - $this->_mark_timestamp(" note"); if (!get_pref("CDM_EXPANDED")) { diff --git a/js/Article.js b/js/Article.js index 21973518c..d039882ec 100644 --- a/js/Article.js +++ b/js/Article.js @@ -130,6 +130,11 @@ const Article = { Headlines.toggleUnread(id, 0); }, + renderNote: function (id, note) { + return `
+ ${App.FormFields.icon('note')}
${note ? App.escapeHtml(note) : ""}
+
`; + }, renderTags: function (id, tags) { const tags_short = tags.length > 5 ? tags.slice(0, 5) : tags; @@ -300,7 +305,7 @@ const Article = {
${hl.buttons}
-
${hl.note}
+ ${Article.renderNote(hl.id, hl.note)}
${hl.content} ${Article.renderEnclosures(hl.enclosures)} diff --git a/js/Headlines.js b/js/Headlines.js index 9bc5747c2..60066164f 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -483,7 +483,7 @@ const Headlines = {
-
${hl.note}
+ ${Article.renderNote(hl.id, hl.note)}
diff --git a/js/common.js b/js/common.js index e88b62602..e616c70ba 100755 --- a/js/common.js +++ b/js/common.js @@ -71,9 +71,9 @@ Element.prototype.fadeOut = function() { }()); }; -Element.prototype.fadeIn = function(display){ +Element.prototype.fadeIn = function(display = undefined){ this.style.opacity = 0; - this.style.display = display || "block"; + this.style.display = display == undefined ? "block" : display; const self = this; (function fade() { diff --git a/plugins/note/init.php b/plugins/note/init.php index 278cfe6c3..f4bdf45bc 100644 --- a/plugins/note/init.php +++ b/plugins/note/init.php @@ -55,17 +55,14 @@ class Note extends Plugin { } function setNote() { - $id = $_REQUEST["id"]; - $note = trim(strip_tags($_REQUEST["note"])); + $id = (int)clean($_REQUEST["id"]); + $note = clean($_REQUEST["note"]); $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET note = ? WHERE ref_id = ? AND owner_uid = ?"); $sth->execute([$note, $id, $_SESSION['uid']]); - $formatted_note = Article::_format_note_html($id, $note); - - print json_encode(array("note" => $formatted_note, - "raw_length" => mb_strlen($note))); + print json_encode(["id" => $id, "note" => $note]); } function api_version() { diff --git a/plugins/note/note.js b/plugins/note/note.js index d42fca2c1..a46acb355 100644 --- a/plugins/note/note.js +++ b/plugins/note/note.js @@ -13,16 +13,14 @@ Plugins.Note = { dialog.hide(); if (reply) { - const elem = App.byId("POSTNOTE-" + id); + App.findAll(`div[data-note-for="${reply.id}"]`).forEach((elem) => { + elem.querySelector(".body").innerHTML = reply.note; - if (elem) { - elem.innerHTML = reply.note; - - if (reply.raw_length != 0) - Element.show(elem); + if (reply.note) + elem.show(); else - Element.hide(elem); - } + elem.hide(); + }); } }); } -- cgit v1.2.3-54-g00ecf From cf249d7e8c55542ca6383b430ec77f07401e96ea Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 19 Feb 2021 19:29:43 +0300 Subject: modify classname helpers to use element.classList; fix feed debugger & share--get --- classes/feeds.php | 9 ++++----- js/common.js | 6 +++--- plugins/share/init.php | 1 + 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'js/common.js') diff --git a/classes/feeds.php b/classes/feeds.php index 98a9ed249..0c01ff25a 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -626,11 +626,10 @@ class Feeds extends Handler_Protected { ] }; - + + + + index(); @@ -60,5 +60,5 @@ } header("Content-Type: text/plain"); - print error_json(13); + print Errors::to_json(Errors::E_UNKNOWN_METHOD); ?> -- cgit v1.2.3-54-g00ecf