From d520e13c88aa380a72d278bcaf4c8a0e1228a7be Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Mon, 18 Mar 2019 17:03:28 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D1=83=20=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D1=83=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=BE=D1=82=20=D1=81=D0=B8=D0=BD=D1=85=D1=80=D0=BE?= =?UTF-8?q?=D0=BD=D0=B8=D0=B7=D0=B0=D1=82=D0=BE=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reader/ServerStorage/ServerStorage.vue | 17 ++++++++++++++--- .../Reader/SettingsPage/SettingsPage.vue | 11 +++++++++++ client/store/modules/reader.js | 1 + 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/client/components/Reader/ServerStorage/ServerStorage.vue b/client/components/Reader/ServerStorage/ServerStorage.vue index 16659fd1..98b49c9b 100644 --- a/client/components/Reader/ServerStorage/ServerStorage.vue +++ b/client/components/Reader/ServerStorage/ServerStorage.vue @@ -110,6 +110,10 @@ class ServerStorage extends Vue { return this.$store.state.reader.currentProfile; } + get showServerStorageMessages() { + return this.settings.showServerStorageMessages; + } + checkCurrentProfile() { if (!this.profiles[this.currentProfile]) { this.commit('reader/setCurrentProfile', ''); @@ -118,15 +122,22 @@ class ServerStorage extends Vue { notifySuccessIfNeeded(rev1, rev2) { if (rev1 != rev2) - this.$notify.success({message: 'Данные синхронизированы с сервером'}); + this.success('Данные синхронизированы с сервером'); + } + + success(message) { + if (this.showServerStorageMessages) + this.$notify.success({message}); } warning(message) { - this.$notify.warning({message}); + if (this.showServerStorageMessages) + this.$notify.warning({message}); } error(message) { - this.$notify.error({message}); + if (this.showServerStorageMessages) + this.$notify.error({message}); } async loadSettings() { diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue index a86b8631..d21fa82f 100644 --- a/client/components/Reader/SettingsPage/SettingsPage.vue +++ b/client/components/Reader/SettingsPage/SettingsPage.vue @@ -388,6 +388,7 @@ Включить управление кликом +