From fd93d3f5231796af6a7d6831b425f7bd9439abfc Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Mon, 24 Oct 2022 17:31:21 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Search/AuthorList/AuthorList.vue | 5 ++--- client/components/Search/Search.vue | 11 +++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/client/components/Search/AuthorList/AuthorList.vue b/client/components/Search/AuthorList/AuthorList.vue index 2b5e0f0..4ce55f2 100644 --- a/client/components/Search/AuthorList/AuthorList.vue +++ b/client/components/Search/AuthorList/AuthorList.vue @@ -189,7 +189,6 @@ class AuthorList extends BaseList { list: Object, search: Object, genreMap: Object, - liberamaReady: Boolean, }; loadingMessage = ''; @@ -243,7 +242,7 @@ class AuthorList extends BaseList { } get showReadLink() { - return this.config.bookReadLink != '' || this.liberamaReady; + return this.config.bookReadLink != '' || this.list.liberamaReady; } showHiddenHelp() { @@ -356,7 +355,7 @@ class AuthorList extends BaseList { поэтому повторная попытка должна быть успешной.`, 'Ошибка'); } else if (action == 'readBook') { //читать - if (this.liberamaReady) { + if (this.list.liberamaReady) { this.sendMessage({type: 'submitUrl', data: href}); } else { const url = this.config.bookReadLink.replace('${DOWNLOAD_LINK}', href); diff --git a/client/components/Search/Search.vue b/client/components/Search/Search.vue index bdfcdba..cb2acc0 100644 --- a/client/components/Search/Search.vue +++ b/client/components/Search/Search.vue @@ -111,7 +111,7 @@ - +
@@ -289,6 +289,7 @@ class Search { queryFound: -1, totalFound: 0, inpxHash: '', + liberamaReady: false, }; genreTree = []; @@ -310,8 +311,6 @@ class Search { searchResult = {}; tableData = []; - liberamaReady = false; - created() { this.commit = this.$store.commit; this.api = this.$root.api; @@ -365,7 +364,7 @@ class Search { if (d.type == 'mes') { switch(d.data) { case 'ready': - this.liberamaReady = true; + this.list.liberamaReady = true; this.sendMessage({type: 'mes', data: 'ready'}); this.sendCurrentUrl(); break; @@ -447,7 +446,7 @@ class Search { } this.$root.setAppTitle(result); - if (this.liberamaReady) + if (this.list.liberamaReady) this.sendMessage({type: 'titleChange', data: result}); } @@ -672,7 +671,7 @@ class Search { } async updateSearchFromRouteQuery(to) { - if (this.liberamaReady) + if (this.list.liberamaReady) this.sendCurrentUrl(); if (this.routeUpdating)