From cc3aa413e87b95783dc98a6962a4f51aa6c6d4f6 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 9 Jun 2019 18:23:04 +0700
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D0=BE=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B5=20?=
 =?UTF-8?q?=D1=88=D1=80=D0=B8=D1=84=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Reader/TextPage/TextPage.vue   | 35 ++++++++++---------
 client/components/Reader/versionHistory.js    |  2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue
index 10a73e6b..fad47665 100644
--- a/client/components/Reader/TextPage/TextPage.vue
+++ b/client/components/Reader/TextPage/TextPage.vue
@@ -23,7 +23,6 @@
             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>
         <div v-show="!clickControl && showStatusBar" class="layout" v-html="statusBarClickable" @mousedown.prevent.stop @touchstart.stop
             @click.prevent.stop="onStatusBarClick"></div>
@@ -77,7 +76,6 @@ class TextPage extends Vue {
     page2 = null;
     statusBar = null;
     statusBarClickable = null;
-    fontsLoading = null;
 
     lastBook = null;
     bookPos = 0;
@@ -203,21 +201,6 @@ class TextPage extends Vue {
         this.drawHelper.lineHeight = this.lineHeight;
         this.drawHelper.context = this.context;
 
-        //сообщение "Загрузка шрифтов..."
-        this.$refs.fontsLoading.innerHTML = '';
-        (async() => {
-            await sleep(500);
-            const flText = 'Загрузка шрифта';
-            this.$refs.fontsLoading.innerHTML = flText + ' &nbsp;<i class="el-icon-loading"></i>';
-            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.drawHelper.measureText(flText, {}))/2 + 'px';
-            await sleep(10500);
-            this.$refs.fontsLoading.innerHTML = '';
-        })();
-
         //parsed
         if (this.parsed) {
             this.parsed.p = this.p;
@@ -274,6 +257,18 @@ class TextPage extends Vue {
     async loadFonts() {
         this.fontsLoading = true;
 
+        let inst = null;
+        (async() => {
+            await sleep(500);
+            if (this.fontsLoading)
+                inst = this.$notify({
+                  title: '',
+                  dangerouslyUseHTMLString: true,
+                  message: 'Загрузка шрифта &nbsp;<i class="el-icon-loading"></i>',
+                  duration: 0
+                });
+        })();
+
         if (!this.fontsLoaded)
             this.fontsLoaded = {};
         //загрузка дин.шрифта
@@ -304,6 +299,8 @@ class TextPage extends Vue {
         }
 
         this.fontsLoading = false;
+        if (inst)
+            inst.close();
     }
 
     getSettings() {
@@ -1126,6 +1123,10 @@ class TextPage extends Vue {
     overflow: hidden;
 }
 
+.on-top {
+    z-index: 100;
+}
+
 .back {
     z-index: 5;
 }
diff --git a/client/components/Reader/versionHistory.js b/client/components/Reader/versionHistory.js
index 950852c5..de292bdd 100644
--- a/client/components/Reader/versionHistory.js
+++ b/client/components/Reader/versionHistory.js
@@ -7,7 +7,7 @@ export const versionHistory = [
 <ul>
     <li>исправлен баг - падение сервера при распаковке битых архивов книг</li>
     <li>исправлен баг - не распознавались некоторые книги формата fb2 в кодировке utf8</li>
-    <li>незначительные улучшения прогрессбаров</li>
+    <li>улучшены прогрессбары</li>
 </ul>
 `
 },