Добавлен эффект перелистывания - Мерцание

client/components/Reader/TextPage/DrawHelper.js

@@ -216,9 +216,22 @@ export default class DrawHelper {
             `width: ${w}px; height: ${h}px; box-sizing: border-box; border: 1px solid ${color}"></div>`; 
     }
 
-    async doPageAnimationThaw(page1, page2, duration, isDown, animationFinish) {
+    async doPageAnimationThaw(page1, page2, duration, isDown, animation1Finish) {
         page1.style.animation = `page1-animation-thaw ${duration}ms ease-in 1`;
         page2.style.animation = `page2-animation-thaw ${duration}ms ease-in 1`;
-        await animationFinish(duration + 201);
+        await animation1Finish(duration + 201);
+    }
+
+    async doPageAnimationBlink(page1, page2, duration, isDown, animation1Finish, animation2Finish) {
+        page1.style.opacity = '0';
+        page2.style.opacity = '0';
+        page2.style.animation = `page2-animation-thaw ${duration/2}ms ease-out 1`;
+        await animation2Finish(duration/2 + 201);
+
+        page1.style.opacity = '1';
+        page1.style.animation = `page1-animation-thaw ${duration/2}ms ease-in 1`;
+        await animation1Finish(duration/2 + 201);
+
+        page2.style.opacity = '1';
     }
 }

client/components/Reader/TextPage/TextPage.vue

@@ -5,12 +5,12 @@
             <!-- img -->
         </div>
         <div ref="scrollBox1" class="layout" style="overflow: hidden" @wheel.prevent.stop="onMouseWheel">
-            <div ref="scrollingPage1" class="layout" @transitionend="onScrollingTransitionEnd" @animationend="onPageAnimationEnd">
+            <div ref="scrollingPage1" class="layout" @transitionend="onScrollingTransitionEnd" @animationend="onPage1AnimationEnd">
                 <div v-html="page1"></div>
             </div>
         </div>
         <div ref="scrollBox2" class="layout" style="overflow: hidden" @wheel.prevent.stop="onMouseWheel">
-            <div ref="scrollingPage2" class="layout">
+            <div ref="scrollingPage2" class="layout" @animationend="onPage2AnimationEnd">
                 <div v-html="page2"></div>
             </div>
         </div>
@@ -576,18 +576,35 @@ class TextPage extends Vue {
         }
     }
 
-    onPageAnimationEnd() {
+    onPage1AnimationEnd() {
-        if (this.resolveAnimationFinish)
+        if (this.resolveAnimation1Finish)
-            this.resolveAnimationFinish();
+            this.resolveAnimation1Finish();
+    }
+
+    onPage2AnimationEnd() {
+        if (this.resolveAnimation2Finish)
+            this.resolveAnimation2Finish();
     }
 
     async doPageAnimation() {
         if (this.currentAnimation && !this.inAnimation) {
             this.inAnimation = true;
 
-            const animationFinish = (timeout) => {
+            let animation1Finish = (timeout) => {
                 return new Promise(async(resolve) => {
-                    this.resolveAnimationFinish = resolve;
+                    this.resolveAnimation1Finish = resolve;
+                    let wait = timeout/100;
+                    while (wait > 0 && !this.stopAnimation) {
+                        wait--;
+                        await sleep(100);
+                    }
+                    resolve();
+                });
+            };
+            
+            let animation2Finish = (timeout) => {
+                return new Promise(async(resolve) => {
+                    this.resolveAnimation2Finish = resolve;
                     let wait = timeout/100;
                     while (wait > 0 && !this.stopAnimation) {
                         wait--;
@@ -600,21 +617,29 @@ class TextPage extends Vue {
             const duration = Math.round(3000*(1 - this.pageChangeAnimationSpeed/100));
             let page1 = this.$refs.scrollingPage2;
             let page2 = this.$refs.scrollingPage1;
-            if (!this.toggleLayout)
+            if (!this.toggleLayout) {
                 [page1, page2] = [page2, page1];
+                [animation1Finish, animation2Finish] = [animation2Finish, animation1Finish];
+            }
 
             switch (this.currentAnimation) {
                 case 'thaw':
                     await this.drawHelper.doPageAnimationThaw(page1, page2, 
-                        duration, this.pageChangeDirectionDown, animationFinish);
+                        duration, this.pageChangeDirectionDown, animation1Finish);
+                    break;
+                case 'blink':
+                    await this.drawHelper.doPageAnimationBlink(page1, page2, 
+                        duration, this.pageChangeDirectionDown, animation1Finish, animation2Finish);
                     break;
             }
             
-            page1.style.animation = '';
+            this.resolveAnimation1Finish = null;
-            page2.style.animation = '';
+            this.resolveAnimation2Finish = null;
-            this.resolveAnimationFinish = null;
             this.inAnimation = false;
             this.stopAnimation = false;
+
+            page1.style.animation = '';
+            page2.style.animation = '';
         }
 
         this.currentAnimation = '';

client/store/modules/reader.js

@@ -152,8 +152,8 @@ const settingDefaults = {
         scrollingDelay: 3000,// замедление, ms
         scrollingType: 'ease-in-out', //linear, ease, ease-in, ease-out, ease-in-out
 
-        pageChangeAnimation: 'thaw',// '' - нет, downShift, rightShift, thaw - протаивание, blink - мерцание
+        pageChangeAnimation: 'blink',// '' - нет, downShift, rightShift, thaw - протаивание, blink - мерцание
-        pageChangeAnimationSpeed: 90, //0-100%
+        pageChangeAnimationSpeed: 80, //0-100%
 
         allowUrlParamBookPos: false,
         lazyParseEnabled: false,