From cf933716075ea98ec1004544734a3158ed07a577 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 14 Nov 2021 16:12:27 +0300 Subject: [PATCH] show safe mode warning dialog in prefs --- js/App.js | 4 ++++ js/CommonDialogs.js | 15 +++++++++++++++ js/Feeds.js | 15 ++------------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/js/App.js b/js/App.js index 6c4b6a187..95a9796ff 100644 --- a/js/App.js +++ b/js/App.js @@ -820,6 +820,10 @@ const App = { App.updateRuntimeInfo(); }, 60 * 1000) + if (App.getInitParam("safe_mode") && this.isPrefs()) { + CommonDialogs.safeModeWarning(); + } + console.log("second stage ok"); }, diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js index 4c169b026..4cfc6ec70 100644 --- a/js/CommonDialogs.js +++ b/js/CommonDialogs.js @@ -11,6 +11,21 @@ const CommonDialogs = { const dialog = dijit.byId("infoBox"); if (dialog) dialog.hide(); }, + safeModeWarning: function() { + const dialog = new fox.SingleUseDialog({ + title: __("Safe mode"), + content: `
+ ${__('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.')} +
+ ` + }); + + dialog.show(); + }, subscribeToFeed: function() { xhr.json("backend.php", {op: "feeds", method: "subscribeToFeed"}, diff --git a/js/Feeds.js b/js/Feeds.js index 27586ab13..5ef554af0 100644 --- a/js/Feeds.js +++ b/js/Feeds.js @@ -278,19 +278,8 @@ const Feeds = { } if (App.getInitParam("safe_mode")) { - const dialog = new fox.SingleUseDialog({ - title: __("Safe mode"), - content: `
- ${__('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.')} -
- ` - }); - - dialog.show(); + /* global CommonDialogs */ + CommonDialogs.safeModeWarning(); } // bw_limit disables timeout() so we request initial counters separately