From 9160b4ef9053fc740c6ad05bf2b3943ad35e6ba1 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Thu, 13 Oct 2022 21:12:56 +0700 Subject: [PATCH] =?UTF-8?q?=20=D0=93=D0=BB=D0=BE=D0=B1=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20SettingsPage=20(=D0=B7=D0=B0=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D1=87=D0=B5=D0=BD=D0=BE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reader/SettingsPage/SettingsPage.vue | 16 -- .../SettingsPage/ViewTab/Color/Color.vue | 4 +- .../Reader/SettingsPage/ViewTab/Font/Font.vue | 4 +- .../Reader/SettingsPage/ViewTab/Mode/Mode.vue | 4 +- .../Reader/SettingsPage/ViewTab/Status.inc | 64 ------ .../SettingsPage/ViewTab/Status/Status.vue | 153 +++++++++++++ .../Reader/SettingsPage/ViewTab/Text.inc | 127 ----------- .../Reader/SettingsPage/ViewTab/Text/Text.vue | 210 ++++++++++++++++++ .../Reader/SettingsPage/ViewTab/ViewTab.vue | 14 +- 9 files changed, 375 insertions(+), 221 deletions(-) delete mode 100644 client/components/Reader/SettingsPage/ViewTab/Status.inc create mode 100644 client/components/Reader/SettingsPage/ViewTab/Status/Status.vue delete mode 100644 client/components/Reader/SettingsPage/ViewTab/Text.inc create mode 100644 client/components/Reader/SettingsPage/ViewTab/Text/Text.vue diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue index f2e1ccec..95956809 100644 --- a/client/components/Reader/SettingsPage/SettingsPage.vue +++ b/client/components/Reader/SettingsPage/SettingsPage.vue @@ -106,13 +106,6 @@ const componentOptions = { }, deep: true, }, - statusBarColor(newValue) { - this.statusBarColorFiltered = newValue; - }, - statusBarColorFiltered(newValue) { - if (hex.test(newValue)) - this.statusBarColor = newValue; - }, }, }; class SettingsPage { @@ -135,8 +128,6 @@ class SettingsPage { isSetsChanged = false; - statusBarColorFiltered = ''; - created() { this.commit = this.$store.commit; @@ -159,9 +150,6 @@ class SettingsPage { this.isSetsChanged = true; try { this.form = reactive(_.cloneDeep(this.settings)); - const form = this.form; - - this.statusBarColorFiltered = form.statusBarColor; } finally { await this.$nextTick(); this.isSetsChanged = false; @@ -172,10 +160,6 @@ class SettingsPage { return this.$store.state.reader.settings; } - needReload() { - this.$root.notify.warning('Необходимо обновить страницу (F5), чтобы изменения возымели эффект'); - } - close() { this.$emit('do-action', {action: 'settings'}); } diff --git a/client/components/Reader/SettingsPage/ViewTab/Color/Color.vue b/client/components/Reader/SettingsPage/ViewTab/Color/Color.vue index 568a794b..855372b8 100644 --- a/client/components/Reader/SettingsPage/ViewTab/Color/Color.vue +++ b/client/components/Reader/SettingsPage/ViewTab/Color/Color.vue @@ -1,5 +1,5 @@