From 8b67cd09adb594e2d2e76ea201e27b7821d45e39 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 21 Oct 2022 12:41:35 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Search/Search.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/components/Search/Search.vue b/client/components/Search/Search.vue
index ea3ebe0..32cf1b8 100644
--- a/client/components/Search/Search.vue
+++ b/client/components/Search/Search.vue
@@ -205,7 +205,7 @@
                                     <div v-if="book.showAllBooks && book.showMore" class="row items-center q-mr-md">
                                         <i class="las la-ellipsis-h text-red" style="font-size: 40px"></i>
                                         <q-btn class="q-ml-md" color="red" style="width: 200px" dense rounded no-caps @click="showMoreSeries(book)">
-                                            Показать еще ({{ showMoreCount }})
+                                            Показать еще (~{{ showMoreCount }})
                                         </q-btn>
                                         <q-btn class="q-ml-sm" color="red" style="width: 200px" dense rounded no-caps @click="showMoreSeries(book, true)">
                                             Показать все ({{ (book.allBooksLoaded && book.allBooksLoaded.length) || '?' }})
@@ -236,7 +236,7 @@
                 <div v-if="isExpanded(item) && item.showMore" class="row items-center book-row q-mb-sm">
                     <i class="las la-ellipsis-h text-blue-10" style="font-size: 40px"></i>
                     <q-btn class="q-ml-md" color="primary" style="width: 200px" dense rounded no-caps @click="showMore(item)">
-                        Показать еще ({{ showMoreCount }})
+                        Показать еще (~{{ showMoreCount }})
                     </q-btn>
                     <q-btn class="q-ml-sm" color="primary" style="width: 200px" dense rounded no-caps @click="showMore(item, true)">
                         Показать все ({{ (item.booksLoaded && item.booksLoaded.length) || '?' }})
@@ -1197,7 +1197,7 @@ class Search {
         if (item.booksLoaded) {
             const currentLen = (item.books ? item.books.length : 0);
             let books;
-            if (all) {
+            if (all || currentLen + showMoreCount*1.5 > item.booksLoaded.length) {
                 books = item.booksLoaded;
             } else {
                 books = item.booksLoaded.slice(0, currentLen + showMoreCount);
@@ -1212,7 +1212,7 @@ class Search {
         if (seriesItem.allBooksLoaded) {
             const currentLen = (seriesItem.allBooks ? seriesItem.allBooks.length : 0);
             let books;
-            if (all) {
+            if (all || currentLen + showMoreCount*1.5 > seriesItem.allBooksLoaded.length) {
                 books = seriesItem.allBooksLoaded;
             } else {
                 books = seriesItem.allBooksLoaded.slice(0, currentLen + showMoreCount);