valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some eslint-related stuff

This commit is contained in:
Andrew Dolgov 2021-02-19 07:29:21 +03:00
parent 0832dd9d40
commit bec35200e9
8 changed files with 68 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
js/App.js
View File

@ -1,9 +1,9 @@
'use strict'; 'use strict';
/* eslint-disable new-cap */ /* eslint-disable new-cap */
/* global __, Article, Ajax, Headlines, Filters, fox */ /* global __, Article, Headlines, Filters, fox */
/* global xhrPost, xhrJson, dojo, dijit, PluginHost, Notify, $$, Feeds, Cookie */ /* global xhrPost, xhrJson, dojo, dijit, PluginHost, Notify, Feeds, Cookie */
/* global CommonDialogs, Plugins, Effect */ /* global CommonDialogs, Plugins */
const App = { const App = {
_initParams: [], _initParams: [],
@ -234,7 +234,7 @@ const App = {
}, },
urlParam: function(name) { urlParam: function(name) {
try { 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; return decodeURIComponent(results[1].replace(/\+/g, " ")) || 0;
} catch (e) { } catch (e) {
return 0; return 0;
@ -439,40 +439,38 @@ const App = {
return false; return false;
}, },
parseRuntimeInfo: function(data) { parseRuntimeInfo: function(data) {
for (const k in data) { Object.keys(data).forEach((k) => {
if (data.hasOwnProperty(k)) { const v = data[k];
const v = data[k];
console.log("RI:", k, "=>", v); console.log("RI:", k, "=>", v);
if (k == "daemon_is_running" && v != 1) { if (k == "daemon_is_running" && v != 1) {
Notify.error("Update daemon is not running.", true); Notify.error("Update daemon is not running.", true);
return; return;
} }
if (k == "recent_log_events") { if (k == "recent_log_events") {
const alert = App.findAll(".log-alert")[0]; const alert = App.findAll(".log-alert")[0];
if (alert) { if (alert) {
v > 0 ? alert.show() : alert.hide(); v > 0 ? alert.show() : alert.hide();
} }
} }
if (k == "daemon_stamp_ok" && v != 1) { if (k == "daemon_stamp_ok" && v != 1) {
Notify.error("Update daemon is not updating feeds.", true); Notify.error("Update daemon is not updating feeds.", true);
return; return;
} }
if (k == "max_feed_id" || k == "num_feeds") { if (k == "max_feed_id" || k == "num_feeds") {
if (this.getInitParam(k) != v) { if (this.getInitParam(k) != v) {
console.log("feed count changed, need to reload feedlist."); console.log("feed count changed, need to reload feedlist.");
Feeds.reload(); Feeds.reload();
} }
} }
this.setInitParam(k, v); this.setInitParam(k, v);
} });
}
PluginHost.run(PluginHost.HOOK_RUNTIME_INFO_LOADED, data); PluginHost.run(PluginHost.HOOK_RUNTIME_INFO_LOADED, data);
}, },
@ -500,39 +498,36 @@ const App = {
if (params) { if (params) {
console.log('reading init-params...'); console.log('reading init-params...');
for (const k in params) { Object.keys(params).forEach((k) => {
if (params.hasOwnProperty(k)) { switch (k) {
switch (k) { case "label_base_index":
case "label_base_index": this.LABEL_BASE_INDEX = parseInt(params[k]);
this.LABEL_BASE_INDEX = parseInt(params[k]); break;
break; case "cdm_auto_catchup":
case "cdm_auto_catchup": if (params[k] == 1) {
if (params[k] == 1) { const hl = App.byId("headlines-frame");
const hl = App.byId("headlines-frame"); if (hl) hl.addClassName("auto_catchup");
if (hl) hl.addClassName("auto_catchup"); }
} break;
break; case "hotkeys":
case "hotkeys": // filter mnemonic definitions (used for help panel) from hotkeys map
// filter mnemonic definitions (used for help panel) from hotkeys map // i.e. *(191)|Ctrl-/ -> *(191)
// i.e. *(191)|Ctrl-/ -> *(191) {
{ const tmp = [];
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; Object.keys(params[k][1]).forEach((sequence) => {
} const filtered = sequence.replace(/\|.*$/, "");
break; tmp[filtered] = params[k][1][sequence];
} });
console.log("IP:", k, "=>", params[k]); params[k][1] = tmp;
this.setInitParam(k, params[k]); }
} break;
} }
console.log("IP:", k, "=>", params[k]);
this.setInitParam(k, params[k]);
});
// PluginHost might not be available on non-index pages // PluginHost might not be available on non-index pages
if (typeof PluginHost !== 'undefined') if (typeof PluginHost !== 'undefined')

2
js/Article.js
View File

@ -1,7 +1,7 @@
'use strict' 'use strict'
/* eslint-disable no-new */ /* 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 = { const Article = {
_scroll_reset_timeout: false, _scroll_reset_timeout: false,

2
js/CommonDialogs.js
View File

@ -3,7 +3,7 @@
/* eslint-disable new-cap */ /* eslint-disable new-cap */
/* eslint-disable no-new */ /* 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 */ /* exported CommonDialogs */
const CommonDialogs = { const CommonDialogs = {

4
js/CommonFilters.js
View File

@ -2,8 +2,8 @@
/* eslint-disable no-new */ /* eslint-disable no-new */
/* global __, App, Article, Lists, Effect, fox */ /* global __, App, Article, Lists, fox */
/* global xhrPost, dojo, dijit, Notify, $$, Feeds */ /* global xhrPost, dojo, dijit, Notify, Feeds */
const Filters = { const Filters = {
filterDlgCheckAction: function(sender) { filterDlgCheckAction: function(sender) {

2
js/PrefHelpers.js
View File

@ -1,7 +1,7 @@
'use strict'; 'use strict';
/* eslint-disable no-new */ /* 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 = { const Helpers = {
AppPasswords: { AppPasswords: {

2
js/PrefUsers.js
View File

@ -1,7 +1,7 @@
'use strict' 'use strict'
/* global __ */ /* global __ */
/* global xhrPost, xhrJson, dojo, dijit, Notify, Tables, App, fox */ /* global xhrPost, xhrJson, dijit, Notify, Tables, App, fox */
const Users = { const Users = {
reload: function(sort) { reload: function(sort) {

5
js/common.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
/* global dijit, __, App, Ajax */ /* global dijit, __, App, dojo, __csrf_token */
/* eslint-disable no-new */ /* eslint-disable no-new */
function $(id) { function $(id) {
@ -111,6 +111,8 @@ String.prototype.stripTags = function() {
/* xhr shorthand helpers */ /* xhr shorthand helpers */
// TODO: this should become xhr { Post: ..., Json: ... }
/* exported xhrPost */ /* exported xhrPost */
function xhrPost(url, params = {}, complete = undefined) { function xhrPost(url, params = {}, complete = undefined) {
console.log("xhrPost:", params); console.log("xhrPost:", params);
@ -144,6 +146,7 @@ function xhrJson(url, params = {}, complete = undefined) {
obj = JSON.parse(reply.responseText); obj = JSON.parse(reply.responseText);
} catch (e) { } catch (e) {
console.error("xhrJson", e, reply); console.error("xhrJson", e, reply);
reject(e);
} }
if (complete != undefined) complete(obj); if (complete != undefined) complete(obj);

2
js/tt-rss.js
View File

@ -1,6 +1,6 @@
'use strict' 'use strict'
/* global require, App, $H */ /* global require, App, dojo */
/* exported Plugins */ /* exported Plugins */
const Plugins = {}; const Plugins = {};