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

* OPML import: don't reload everything, just feed tree 

* dialogs: use auto-destroying dialog for almost all dialogs instead of destroying them manually
* some general dialog-related cleanup
This commit is contained in:
Andrew Dolgov 2021-02-12 15:22:10 +03:00
parent 219cc9a0ab
commit 3d11c61f32
18 changed files with 275 additions and 351 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/pref/prefs.php
View File

@ -8,7 +8,7 @@ class Pref_Prefs extends Handler_Protected {
private $profile_blacklist = [];
function csrf_ignore($method) {
$csrf_ignored = array("index", "updateself", "editprefprofiles", "otpqrcode");
$csrf_ignored = array("index", "updateself", "otpqrcode");
return array_search($method, $csrf_ignored) !== false;
}

2
classes/pref/users.php
View File

@ -12,7 +12,7 @@ class Pref_Users extends Handler_Protected {
}
function csrf_ignore($method) {
$csrf_ignored = array("index", "edit", "userdetails");
$csrf_ignored = array("index", "userdetails");
return array_search($method, $csrf_ignored) !== false;
}

11
js/App.js
View File

@ -1,6 +1,6 @@
'use strict';
/* global __, Article, Ajax, Headlines, Filters */
/* global __, Article, Ajax, Headlines, Filters, fox */
/* global xhrPost, xhrJson, dojo, dijit, PluginHost, Notify, $$, Feeds, Cookie */
/* global CommonDialogs, Plugins, Effect */
@ -313,7 +313,7 @@ const App = {
},
helpDialog: function(topic) {
xhrPost("backend.php", {op: "backend", method: "help", topic: topic}, (transport) => {
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
title: __("Help"),
content: transport.responseText,
});
@ -333,7 +333,7 @@ const App = {
let dialog = dijit.byId("infoBox");
if (!dialog) {
dialog = new dijit.Dialog({
dialog = new fox.SingleUseDialog({
title: title,
id: 'infoBox',
onCancel: function () {
@ -577,9 +577,6 @@ const App = {
}
try {
if (dijit.byId("exceptionDlg"))
dijit.byId("exceptionDlg").destroyRecursive();
let stack_msg = "";
if (error.stack)
@ -599,7 +596,7 @@ const App = {
</div>
</div>`;
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
id: "exceptionDlg",
title: params.title || __("Unhandled exception"),
content: content

7
js/Article.js
View File

@ -1,6 +1,6 @@
'use strict'
/* global __, ngettext, App, Headlines, xhrPost, xhrJson, dojo, dijit, PluginHost, Notify, $$, Ajax */
/* global __, ngettext, App, Headlines, xhrPost, xhrJson, dojo, dijit, PluginHost, Notify, $$, Ajax, fox */
const Article = {
_scroll_reset_timeout: false,
@ -250,12 +250,9 @@ const Article = {
return false;
},
editTags: function (id) {
if (dijit.byId("editTagsDlg"))
dijit.byId("editTagsDlg").destroyRecursive();
xhrPost("backend.php", {op: "article", method: "editarticletags", param: id}, (transport) => {
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
id: "editTagsDlg",
title: __("Edit article Tags"),
content: transport.responseText,

33
js/CommonDialogs.js
View File

@ -1,6 +1,6 @@
'use strict'
/* global __, ngettext, dojo, dijit, Notify, App, Feeds, $$, xhrPost, xhrJson, Tables, Effect */
/* global __, ngettext, dojo, dijit, Notify, App, Feeds, $$, xhrPost, xhrJson, Tables, Effect, fox */
/* exported CommonDialogs */
const CommonDialogs = {
@ -75,16 +75,11 @@ const CommonDialogs = {
return false;
},
quickAddFeed: function() {
// overlapping widgets
if (dijit.byId("batchSubDlg")) dijit.byId("batchSubDlg").destroyRecursive();
if (dijit.byId("feedAddDlg")) dijit.byId("feedAddDlg").destroyRecursive();
xhrPost("backend.php",
{op: "feeds", method: "quickAddFeed"},
(transport) => {
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
id: "feedAddDlg",
title: __("Subscribe to Feed"),
content: transport.responseText,
@ -192,10 +187,7 @@ const CommonDialogs = {
showFeedsWithErrors: function() {
const query = {op: "pref-feeds", method: "feedsWithErrors"};
if (dijit.byId("errorFeedsDlg"))
dijit.byId("errorFeedsDlg").destroyRecursive();
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
id: "errorFeedsDlg",
title: __("Feeds with update errors"),
getSelectedFeeds: function () {
@ -298,13 +290,7 @@ const CommonDialogs = {
console.log("editFeed", query);
if (dijit.byId("filterEditDlg"))
dijit.byId("filterEditDlg").destroyRecursive();
if (dijit.byId("feedEditDlg"))
dijit.byId("feedEditDlg").destroyRecursive();
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
id: "feedEditDlg",
title: __("Edit Feed"),
execute: function () {
@ -363,10 +349,7 @@ const CommonDialogs = {
xhrJson("backend.php", {op: "pref-feeds", method: "getOPMLKey"}, (reply) => {
try {
if (dijit.byId("publicOPMLDlg"))
dijit.byId("publicOPMLDlg").destroyRecursive();
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
title: __("Public OPML URL"),
id: 'publicOPMLDlg',
onCancel: function () {
@ -411,14 +394,10 @@ const CommonDialogs = {
xhrJson("backend.php", {op: "pref-feeds", method: "getFeedKey", id: feed, is_cat: is_cat}, (reply) => {
try {
if (dijit.byId("genFeedDlg"))
dijit.byId("genFeedDlg").destroyRecursive();
const feed_title = Feeds.getName(feed, is_cat);
const secret_url = rss_url + "&key=" + encodeURIComponent(reply.link);
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
title: __("Show as feed"),
id: 'genFeedDlg',
onCancel: function () {

20
js/CommonFilters.js
View File

@ -1,6 +1,6 @@
'use strict'
/* global __, App, Article, Lists, Effect */
/* global __, App, Article, Lists, Effect, fox */
/* global xhrPost, dojo, dijit, Notify, $$, Feeds */
const Filters = {
@ -138,10 +138,7 @@ const Filters = {
},
test: function(params) {
if (dijit.byId("filterTestDlg"))
dijit.byId("filterTestDlg").destroyRecursive();
const test_dlg = new dijit.Dialog({
const test_dlg = new fox.SingleUseDialog({
id: "filterTestDlg",
title: "Test Filter",
results: 0,
@ -249,13 +246,8 @@ const Filters = {
console.log('Filters.edit', query);
xhrPost("backend.php", query, function (transport) {
if (dijit.byId("feedEditDlg"))
dijit.byId("feedEditDlg").destroyRecursive();
if (dijit.byId("filterEditDlg"))
dijit.byId("filterEditDlg").destroyRecursive();
const dialog = new dijit.Dialog({
try {
const dialog = new fox.SingleUseDialog({
id: "filterEditDlg",
title: __("Create Filter"),
test: function () {
@ -371,6 +363,10 @@ const Filters = {
});
}
dialog.show();
} catch (e) {
App.Error.report(e);
}
});
},
};

52
js/Feeds.js
View File

@ -1,6 +1,6 @@
'use strict'
/* global __, App, Headlines, xhrPost, dojo, dijit, Form, fox, PluginHost, Notify, $$ */
/* global __, App, Headlines, xhrPost, dojo, dijit, Form, fox, PluginHost, Notify, $$, fox */
const Feeds = {
counters_last_request: 0,
@ -223,10 +223,7 @@ const Feeds = {
if (App.getInitParam("is_default_pw")) {
console.warn("user password is at default value");
if (dijit.byId("defaultPasswordDlg"))
dijit.byId("defaultPasswordDlg").destroyRecursive();
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
title: __("Your password is at default value"),
content: `<div class='alert alert-error'>
${__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication).")}
@ -236,51 +233,26 @@ const Feeds = {
<button dojoType='dijit.form.Button' class='alt-primary' onclick="document.location.href = 'prefs.php'">
${__('Open Preferences')}
</button>
<button dojoType='dijit.form.Button' onclick="return dijit.byId('defaultPasswordDlg').hide()">
<button dojoType='dijit.form.Button' onclick="App.dialogOf(this).hide()">
${__('Close this window')}
</button>
</footer>`,
id: 'defaultPasswordDlg',
onCancel: function () {
return true;
},
onExecute: function () {
return true;
},
onClose: function () {
return true;
}
</footer>`
});
dialog.show();
}
if (dijit.byId("safeModeDlg"))
dijit.byId("safeModeDlg").destroyRecursive();
if (App.getInitParam("safe_mode")) {
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
title: __("Safe mode"),
content: `
<div class='alert alert-info'>
content: `<div class='alert alert-info'>
${__('Tiny Tiny RSS is running in safe mode. All themes and plugins are disabled. You will need to log out and back in to disable it.')}
</div>
<footer class='text-center'>
<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>
${__('Close this window')}
</button>
</footer>
`,
id: 'safeModeDlg',
onCancel: function () {
return true;
},
onExecute: function () {
return true;
},
onClose: function () {
return true;
}
</footer>`
});
dialog.show();
@ -598,10 +570,8 @@ const Feeds = {
{op: "feeds", method: "search",
param: Feeds.getActive() + ":" + Feeds.activeIsCat()},
(transport) => {
if (dijit.byId("searchDlg"))
dijit.byId("searchDlg").destroyRecursive();
const dialog = new dijit.Dialog({
try {
const dialog = new fox.SingleUseDialog({
id: "searchDlg",
content: transport.responseText,
title: __("Search"),
@ -631,10 +601,12 @@ const Feeds = {
dijit.byId('search_language')
.attr('value', Feeds._search_query.search_language);
}
});
dialog.show();
} catch (e) {
App.Error.report(e);
}
});
},

34
js/PrefFeedTree.js
View File

@ -1,4 +1,4 @@
/* global __, lib, dijit, define, dojo, CommonDialogs, Notify, Tables, xhrPost */
/* global __, lib, dijit, define, dojo, CommonDialogs, Notify, Tables, xhrPost, fox, App */
define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], function (declare, domConstruct) {
@ -250,13 +250,11 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
Notify.progress("Loading, please wait...");
if (dijit.byId("feedEditDlg"))
dijit.byId("feedEditDlg").destroyRecursive();
xhrPost("backend.php", {op: "pref-feeds", method: "editfeeds", ids: rows.toString()}, (transport) => {
Notify.close();
const dialog = new dijit.Dialog({
try {
const dialog = new fox.SingleUseDialog({
id: "feedEditDlg",
title: __("Edit Multiple Feeds"),
getChildByName: function (name) {
@ -308,6 +306,9 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
});
dialog.show();
} catch (e) {
App.Error.report(e);
}
});
},
editCategory: function(id, item) {
@ -339,13 +340,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
}
},
batchSubscribe: function() {
const query = "backend.php?op=pref-feeds&method=batchSubscribe";
// overlapping widgets
if (dijit.byId("batchSubDlg")) dijit.byId("batchSubDlg").destroyRecursive();
if (dijit.byId("feedAddDlg")) dijit.byId("feedAddDlg").destroyRecursive();
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
id: "batchSubDlg",
title: __("Batch subscribe"),
execute: function () {
@ -362,18 +357,13 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
});
}
},
href: query
href: "backend.php?" + dojo.objectToQuery({op: 'pref-feeds', method: 'batchSubscribe'})
});
dialog.show();
},
showInactiveFeeds: function() {
const query = "backend.php?op=pref-feeds&method=inactiveFeeds";
if (dijit.byId("inactiveFeedsDlg"))
dijit.byId("inactiveFeedsDlg").destroyRecursive();
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
id: "inactiveFeedsDlg",
title: __("Feeds without recent updates"),
getSelectedFeeds: function () {
@ -405,11 +395,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
alert(__("No feeds selected."));
}
},
execute: function () {
if (this.validate()) {
}
},
href: query
href: 'backend.php?' + dojo.objectToQuery({op: 'pref-feeds', method: 'inactiveFeeds'})
});
dialog.show();

33
js/PrefHelpers.js
View File

@ -1,6 +1,6 @@
'use strict';
/* global __, dijit, dojo, Tables, xhrPost, Notify, xhrJson, App */
/* global __, dijit, dojo, Tables, xhrPost, Notify, xhrJson, App, fox */
const Helpers = {
AppPasswords: {
@ -83,14 +83,7 @@ const Helpers = {
},
},
editProfiles: function() {
if (dijit.byId("profileEditDlg"))
dijit.byId("profileEditDlg").destroyRecursive();
const query = "backend.php?op=pref-prefs&method=editPrefProfiles";
// noinspection JSUnusedGlobalSymbols
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
id: "profileEditDlg",
title: __("Settings Profiles"),
getSelectedProfiles: function () {
@ -110,7 +103,7 @@ const Helpers = {
xhrPost("backend.php", query, () => {
Notify.close();
Helpers.editProfiles();
dialog.refresh();
});
}
@ -126,11 +119,16 @@ const Helpers = {
xhrPost("backend.php", query, () => {
Notify.close();
Helpers.editProfiles();
dialog.refresh();
});
}
},
refresh: function() {
xhrPost("backend.php", {op: 'pref-prefs', method: 'editPrefProfiles'}, (transport) => {
dialog.attr('content', transport.responseText);
});
},
execute: function () {
const sel_rows = this.getSelectedProfiles();
@ -147,15 +145,16 @@ const Helpers = {
alert(__("Please choose a profile to activate."));
}
},
href: query
content: ""
});
dialog.refresh();
dialog.show();
},
customizeCSS: function() {
xhrJson("backend.php", {op: "pref-prefs", method: "customizeCSS"}, (reply) => {
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
title: __("Customize stylesheet"),
apply: function() {
xhrPost("backend.php", this.attr('value'), () => {
@ -245,13 +244,15 @@ const Helpers = {
xhr.onload = function () {
Notify.close();
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
title: __("OPML Import"),
onCancel: function () {
window.location.reload();
this.execute();
},
execute: function () {
window.location.reload();
const tree = dijit.byId('feedTree');
if (tree) tree.reload();
},
content: `
<div class='alert alert-info'>

7
js/PrefLabelTree.js
View File

@ -1,4 +1,4 @@
/* global __, define, lib, dijit, dojo, xhrPost, Notify */
/* global __, define, lib, dijit, dojo, xhrPost, Notify, fox */
define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/form/DropDownButton"], function (declare, domConstruct) {
@ -62,10 +62,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
const query = "backend.php?op=pref-labels&method=edit&id=" +
encodeURIComponent(id);
if (dijit.byId("labelEditDlg"))
dijit.byId("labelEditDlg").destroyRecursive();
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
id: "labelEditDlg",
title: __("Label Editor"),
style: "width: 650px",

14
js/PrefUsers.js
View File

@ -1,7 +1,7 @@
'use strict'
/* global __ */
/* global xhrPost, dojo, dijit, Notify, Tables */
/* global xhrPost, dojo, dijit, Notify, Tables, fox */
const Users = {
reload: function(sort) {
@ -27,13 +27,8 @@ const Users = {
}
},
edit: function(id) {
const query = "backend.php?op=pref-users&method=edit&id=" +
encodeURIComponent(id);
if (dijit.byId("userEditDlg"))
dijit.byId("userEditDlg").destroyRecursive();
const dialog = new dijit.Dialog({
xhrPost('backend.php', {op: 'pref-users', method: 'edit', id: id}, (transport) => {
const dialog = new fox.SingleUseDialog({
id: "userEditDlg",
title: __("User Editor"),
execute: function () {
@ -46,10 +41,11 @@ const Users = {
});
}
},
href: query
content: transport.responseText
});
dialog.show();
});
},
resetSelected: function() {
const rows = this.getSelection();

8
js/SingleUseDialog.js Normal file
View File

@ -0,0 +1,8 @@
/* global dijit, define */
define(["dojo/_base/declare", "dijit/Dialog"], function (declare) {
return declare("fox.SingleUseDialog", dijit.Dialog, {
onHide: function() {
this.destroyRecursive();
}
});
});

1
js/prefs.js
View File

@ -51,6 +51,7 @@ require(["dojo/_base/kernel",
"fox/PrefFilterTree",
"fox/PrefLabelTree",
"fox/Toolbar",
"fox/SingleUseDialog",
"fox/form/ValidationTextArea",
"fox/form/Select",
"fox/form/ComboButton",

1
js/tt-rss.js
View File

@ -50,6 +50,7 @@ require(["dojo/_base/kernel",
"fox/FeedStoreModel",
"fox/FeedTree",
"fox/Toolbar",
"fox/SingleUseDialog",
"fox/form/ValidationTextArea",
"fox/form/Select",
"fox/form/ComboButton",

9
plugins/mail/mail.js
View File

@ -1,7 +1,9 @@
/* global Plugins, Headlines, xhrJson, Notify, fox, __ */
Plugins.Mail = {
send: function(id) {
if (!id) {
let ids = Headlines.getSelected();
const ids = Headlines.getSelected();
if (ids.length == 0) {
alert(__("No articles selected."));
@ -11,12 +13,9 @@ Plugins.Mail = {
id = ids.toString();
}
if (dijit.byId("emailArticleDlg"))
dijit.byId("emailArticleDlg").destroyRecursive();
const query = "backend.php?op=pluginhandler&plugin=mail&method=emailArticle&param=" + encodeURIComponent(id);
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
id: "emailArticleDlg",
title: __("Forward article by email"),
execute: function () {

7
plugins/mailto/init.js
View File

@ -1,3 +1,5 @@
/* global Plugins, Headlines, fox, __ */
Plugins.Mailto = {
send: function (id) {
if (!id) {
@ -11,12 +13,9 @@ Plugins.Mailto = {
id = ids.toString();
}
if (dijit.byId("emailArticleDlg"))
dijit.byId("emailArticleDlg").destroyRecursive();
const query = "backend.php?op=pluginhandler&plugin=mailto&method=emailArticle&param=" + encodeURIComponent(id);
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
id: "emailArticleDlg",
title: __("Forward article by email"),
href: query});

7
plugins/note/note.js
View File

@ -1,11 +1,10 @@
/* global Plugins, xhrJson, Notify, fox, __ */
Plugins.Note = {
edit: function(id) {
const query = "backend.php?op=pluginhandler&plugin=note&method=edit&param=" + encodeURIComponent(id);
if (dijit.byId("editNoteDlg"))
dijit.byId("editNoteDlg").destroyRecursive();
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
id: "editNoteDlg",
title: __("Edit article note"),
execute: function () {

12
plugins/share/share.js
View File

@ -1,11 +1,10 @@
/* global Plugins, xhrJson, Notify, fox, xhrPost, __ */
Plugins.Share = {
shareArticle: function(id) {
if (dijit.byId("shareArticleDlg"))
dijit.byId("shareArticleDlg").destroyRecursive();
const query = "backend.php?op=pluginhandler&plugin=share&method=shareArticle&param=" + encodeURIComponent(id);
const dialog = new dijit.Dialog({
const dialog = new fox.SingleUseDialog({
id: "shareArticleDlg",
title: __("Share article by URL"),
newurl: function () {
@ -73,7 +72,4 @@ Plugins.Share = {
const img = $("SHARE-IMG-" + id);
img.addClassName("shared");
}
};
}