From 9ef9c5597b4b657df2d9532bde93af0247a03df7 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 30 Jan 2019 16:50:52 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=84=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B2=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B9=20=D0=B4=D0=B8=D0=B2,=20=D0=BF=D0=BE=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=BF=D0=BE=20=D1=85=D0=BE=D0=B4=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Reader/TextPage/TextPage.vue   | 48 +++++++++++++------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue
index 52fd5a7f..a82105fd 100644
--- a/client/components/Reader/TextPage/TextPage.vue
+++ b/client/components/Reader/TextPage/TextPage.vue
@@ -1,13 +1,15 @@
 <template>
     <div ref="main" class="main">
-        <div v-show="toggleLayout" class="layout">
-            <div v-html="page1"></div>
-        </div>
-        <div v-show="!toggleLayout" class="layout">
-            <div v-html="page2"></div>
-        </div>
-        <div v-show="showStatusBar" ref="statusBar" class="layout">
-            <div v-html="statusBar"></div>
+        <div class="background">
+            <div v-show="toggleLayout" class="layout">
+                <div v-html="page1"></div>
+            </div>
+            <div v-show="!toggleLayout" class="layout">
+                <div v-html="page2"></div>
+            </div>
+            <div v-show="showStatusBar" ref="statusBar" class="layout">
+                <div v-html="statusBar"></div>
+            </div>
         </div>
         <div ref="layoutEvents" class="layout events" @mousedown.prevent.stop="onMouseDown" @mouseup.prevent.stop="onMouseUp"
             @wheel.prevent.stop="onMouseWheel"
@@ -265,18 +267,26 @@ class TextPage extends Vue {
         if (!omitLoadFonts)
             await this.loadFonts();
 
-        //this.draw();
+        this.setBackground();
+        this.page1 = null;
+        this.page2 = null;
+        this.statusBar = null;
+
+        this.draw();
 
         // шрифты хрен знает когда подгружаются, поэтому
-        if (!this.parsed.force) {
+        const parsed = this.parsed;
+        if (!parsed.force) {
             let i = 0;
-            this.parsed.force = true;
+            parsed.force = true;
             while (i < 10) {
-                this.draw();
                 await sleep(1000);
+                if (!this.parsed)
+                    break;
+                this.draw();
                 i++;
             }
-            this.parsed.force = false;
+            parsed.force = false;
         }
     }
 
@@ -285,8 +295,6 @@ class TextPage extends Vue {
             let fontName = this.fontName;
             this.getSettings();
             await this.calcPropsAndLoadFonts(fontName == this.fontName);
-
-            this.draw();
         })();
     }
 
@@ -343,6 +351,9 @@ class TextPage extends Vue {
         }
     }
 
+    setBackground() {
+    }
+
     onResize() {
         this.calcDrawProps();
         this.draw();
@@ -873,6 +884,13 @@ class TextPage extends Vue {
     min-width: 200px;
 }
 
+.background {
+    margin: 0;
+    padding: 0;
+    position: relative;
+    z-index: 5;
+}
+
 .layout {
     margin: 0;
     padding: 0;