From a631befdf9783ea6dbc0df1b177adae9d66059b2 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Thu, 14 Feb 2019 23:40:51 +0700 Subject: [PATCH 01/16] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B8=D0=BD=D1=84=D0=BE=20=D0=B4=D0=BB=D1=8F=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B8=D1=81=D0=BA=D0=BE=D0=B2=D0=B8=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/index.html.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/index.html.template b/client/index.html.template index b24c9cd1..b27366b9 100644 --- a/client/index.html.template +++ b/client/index.html.template @@ -3,6 +3,8 @@ + + From ca7cc322d7797d034655ee340ae2266ef9b9f4c0 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Fri, 15 Feb 2019 02:46:27 +0700 Subject: [PATCH 02/16] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D1=83?= =?UTF-8?q?=20blinkCachedLoad?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/Reader.vue | 21 ++++++++++++------- .../Reader/SettingsPage/SettingsPage.vue | 9 ++++++++ client/store/modules/reader.js | 1 + 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index fb3d0ccb..77825353 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -133,10 +133,8 @@ export default @Component({ this.loadBook({url: newValue, bookPos: this.routeParamPos}); } }, - settings: function(newValue) { - this.allowUrlParamBookPos = newValue.allowUrlParamBookPos; - this.copyFullText = newValue.copyFullText; - this.showClickMapPage = newValue.showClickMapPage; + settings: function() { + this.loadSettings(); this.updateRoute(); }, loaderActive: function(newValue) { @@ -198,9 +196,7 @@ class Reader extends Vue { this.fullScreenActive = (document.fullscreenElement !== null); }); - this.allowUrlParamBookPos = this.settings.allowUrlParamBookPos; - this.copyFullText = this.settings.copyFullText; - this.showClickMapPage = this.settings.showClickMapPage; + this.loadSettings(); } mounted() { @@ -219,6 +215,14 @@ class Reader extends Vue { })(); } + loadSettings() { + const settings = this.settings; + this.allowUrlParamBookPos = settings.allowUrlParamBookPos; + this.copyFullText = settings.copyFullText; + this.showClickMapPage = settings.showClickMapPage; + this.blinkCachedLoad = settings.blinkCachedLoad; + } + get routeParamPos() { let result = undefined; const q = this.$route.query; @@ -738,6 +742,9 @@ class Reader extends Vue { } blinkCachedLoadMessage() { + if (!this.blinkCachedLoad) + return; + this.blinkCount = 30; if (!this.inBlink) { this.inBlink = true; diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue index e7e3d23f..cdec6dca 100644 --- a/client/components/Reader/SettingsPage/SettingsPage.vue +++ b/client/components/Reader/SettingsPage/SettingsPage.vue @@ -255,6 +255,15 @@ Показывать области управления кликом + + + + Предупреждать о загрузке из кэша + +