From b784d277e40fa547f6112086ebad5c41ea3a21e7 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 4 Feb 2020 12:29:54 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/Reader.vue                    | 10 ++++++++--
 .../Reader/RecentBooksPage/RecentBooksPage.vue         |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index e7517c96..4772d8d2 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -82,7 +82,7 @@
                 @stop-text-search="stopTextSearch">
             </SearchPage>
             <CopyTextPage v-if="copyTextActive" ref="copyTextPage" @copy-text-toggle="copyTextToggle"></CopyTextPage>
-            <RecentBooksPage v-show="recentBooksActive" ref="recentBooksPage" @load-book="loadBook" @recent-books-toggle="recentBooksToggle"></RecentBooksPage>
+            <RecentBooksPage v-show="recentBooksActive" ref="recentBooksPage" @load-book="loadBook" @recent-books-close="recentBooksClose"></RecentBooksPage>
             <SettingsPage v-if="settingsActive" ref="settingsPage" @settings-toggle="settingsToggle"></SettingsPage>
             <HelpPage v-if="helpActive" ref="helpPage" @help-toggle="helpToggle"></HelpPage>
             <ClickMapPage v-show="clickMapActive" ref="clickMapPage"></ClickMapPage>
@@ -342,7 +342,7 @@ class Reader extends Vue {
         const showButtonCount = Object.values(this.showToolButton).reduce((a, b) => a + (b ? 1 : 0), 0);
         if (this.$refs.buttons)
             this.$refs.buttons.style.minWidth = 65*showButtonCount + 'px';
-        (async () => {
+        (async() => {
             await utils.sleep(1000);
             if (this.$refs.header)
                 this.$refs.header.style.overflowX = 'auto';
@@ -682,6 +682,10 @@ class Reader extends Vue {
         }
     }
 
+    recentBooksClose() {
+        this.recentBooksActive = false;
+    }
+
     recentBooksToggle() {
         this.recentBooksActive = !this.recentBooksActive;
         if (this.recentBooksActive) {
@@ -916,6 +920,8 @@ class Reader extends Vue {
             return;
         }
 
+        this.closeAllTextPages();
+
         let url = encodeURI(decodeURI(opts.url));
 
         if ((url.indexOf('http://') != 0) && (url.indexOf('https://') != 0) &&
diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index 312f5020..2a6cee37 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -315,7 +315,7 @@ class RecentBooksPage extends Vue {
     }
 
     close() {
-        this.$emit('recent-books-toggle');
+        this.$emit('recent-books-close');
     }
 
     keyHook(event) {