From 7fd54de0a08e59a34ee731fc7312202ac5eb3536 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 25 Jan 2019 00:28:00 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BA=D1=80=D0=B0=D1=88=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D1=81=D1=82=D0=B2=D0=B0=20=D0=B7=D0=B0=D0=B3?=
 =?UTF-8?q?=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D1=88=D1=80=D0=B8=D1=84=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Reader/TextPage/TextPage.vue   | 61 ++++++++++++++-----
 1 file changed, 45 insertions(+), 16 deletions(-)

diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue
index 0b18dc6b..14e3af7c 100644
--- a/client/components/Reader/TextPage/TextPage.vue
+++ b/client/components/Reader/TextPage/TextPage.vue
@@ -15,6 +15,7 @@
             oncontextmenu="return false;">
             <div v-show="showStatusBar" v-html="statusBarClickable" @mousedown.prevent.stop @touchstart.stop
                 @click.prevent.stop="onStatusBarClick"></div>
+            <div v-show="fontsLoading" ref="fontsLoading"></div>
         </div>
         <canvas ref="offscreenCanvas" style="display: none"></canvas>
     </div>
@@ -46,6 +47,7 @@ class TextPage extends Vue {
     page2 = null;
     statusBar = null;
     statusBarClickable = null;
+    fontsLoading = null;
 
     lastBook = null;
     bookPos = 0;
@@ -94,6 +96,19 @@ class TextPage extends Vue {
     }
 
     async calcDrawProps() {
+        //preloaded fonts
+        this.fontShifts = {//%
+            ReaderDefault: 0,
+            Roboto: 0,
+            OpenSans: 0
+        }
+        if (!this.fontShifts.hasOwnProperty(this.fontName))
+            this.fontShifts[this.fontName] = 0;
+        this.fontList = [];
+        for (let fontName in this.fontShifts)
+            this.fontList.push(`12px ${fontName}`);
+
+        //widths
         this.realWidth = this.$refs.main.clientWidth;
         this.realHeight = this.$refs.main.clientHeight;
 
@@ -115,6 +130,16 @@ class TextPage extends Vue {
             this.parsed.measureText = this.measureText;
         }
 
+        //сообщение "Загрузка шрифтов..."
+        const flText = 'Загрузка шрифтов...';
+        this.$refs.fontsLoading.innerHTML = flText;
+        const fontsLoadingStyle = this.$refs.fontsLoading.style;
+        fontsLoadingStyle.position = 'absolute';
+        fontsLoadingStyle.fontSize = this.fontSize + 'px';
+        fontsLoadingStyle.top = (this.realHeight/2 - 2*this.fontSize) + 'px';
+        fontsLoadingStyle.left = (this.realWidth - this.measureText(flText, {}))/2 + 'px';
+
+        //stuff
         this.statusBarColor = this.hex2rgba(this.textColor, this.statusBarColorAlpha);
         this.currentTransition = '';
         this.pageChangeDirectionDown = true;
@@ -166,17 +191,6 @@ class TextPage extends Vue {
         this.linesUp = null;
         this.linesDown = null;
 
-        //preloaded fonts
-        this.fontShifts = {//%
-            ReaderDefault: 0,
-            Roboto: 0,
-            OpenSans: 0,
-            XoloniumRegular: 0,
-        }
-        this.fontList = [];
-        for (let fontName in this.fontShifts)
-            this.fontList.push(`12px ${fontName}`);
-
         //default draw props
         this.textColor = '#000000';
         this.backgroundColor = '#478355';
@@ -228,16 +242,31 @@ class TextPage extends Vue {
                 this.parsed = parsed;
                 this.calcDrawProps();
 
-                loadCSS(this.fontCssUrl);
-                let done = false;
-                while (!done) {
+                //загрузка дин.шрифта
+                if (this.fontCssUrl)
+                    loadCSS(this.fontCssUrl);
+
+                const waitingTime = 10*1000;
+                const delay = 100;
+                let i = 0;
+                this.fontsLoading = true;
+                //ждем шрифты
+                while (i < waitingTime/delay) {
+                    i++;
                     try {
                         await this.loadFonts();
-                        done = true;
+                        i = waitingTime;
                     } catch (e) {
-                        await sleep(100);
+                        await sleep(delay);
                     }
                 }
+                this.fontsLoading = false;
+                if (i !== waitingTime) {
+                    this.$notify.error({
+                        title: 'Ошибка загрузки',
+                        message: 'Некоторые шрифты не удалось загрузить'
+                    });
+                }
 
                 this.draw();
                 this.refreshTime();