From bbeb92a9dadf1298ab74694b8ec99677f0759817 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 15 Feb 2019 21:41:45 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue         | 2 +-
 client/components/Reader/TextPage/TextPage.vue                | 4 ++--
 client/store/modules/reader.js                                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue
index e1fd1a18..5013c3df 100644
--- a/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue
+++ b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue
@@ -8,7 +8,7 @@
             <li>кэширование файлов книг на клиенте и на сервере</li>
             <li>открытие книг с локального диска</li>
             <li>плавный скроллинг текста</li>
-            <li>анимация перелистывания (скоро)</li>
+            <li>анимация перелистывания</li>
             <li>поиск по тексту и копирование фрагмента</li>
             <li>запоминание недавних книг, скачивание книги из читалки в формате fb2</li>
             <li>управление кликом и с клавиатуры</li>
diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue
index c4b10257..550a2427 100644
--- a/client/components/Reader/TextPage/TextPage.vue
+++ b/client/components/Reader/TextPage/TextPage.vue
@@ -553,7 +553,7 @@ class TextPage extends Vue {
         }
 
         //fast draw prepared
-        if (!this.currentAnimation && this.pageChangeDirectionDown && this.pagePrepared && this.bookPos == this.bookPosPrepared) {
+        if (!this.inAnimation && !this.currentAnimation && this.pageChangeDirectionDown && this.pagePrepared && this.bookPos == this.bookPosPrepared) {
             this.toggleLayout = !this.toggleLayout;
             this.linesDown = this.linesDownNext;
             this.linesUp = this.linesUpNext;
@@ -566,7 +566,7 @@ class TextPage extends Vue {
         }
 
         this.pagePrepared = false;
-        if (!this.currentAnimation)
+        if (!this.inAnimation && !this.currentAnimation)
             this.debouncedPrepareNextPage();
         this.debouncedDrawStatusBar();
 
diff --git a/client/store/modules/reader.js b/client/store/modules/reader.js
index d2169388..b694967c 100644
--- a/client/store/modules/reader.js
+++ b/client/store/modules/reader.js
@@ -153,7 +153,7 @@ const settingDefaults = {
         scrollingType: 'ease-in-out', //linear, ease, ease-in, ease-out, ease-in-out
 
         pageChangeAnimation: 'thaw',// '' - нет, downShift, rightShift, thaw - протаивание, blink - мерцание
-        pageChangeAnimationSpeed: 80, //0-100%
+        pageChangeAnimationSpeed: 90, //0-100%
 
         allowUrlParamBookPos: false,
         lazyParseEnabled: false,