From be8a66ac39424a72da2ffcfa76fe4d6e8b717133 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 27 Jan 2019 08:53:24 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B3=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Reader/HistoryPage/HistoryPage.vue  | 14 +++++++++++---
 client/components/Reader/Reader.vue                |  6 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/client/components/Reader/HistoryPage/HistoryPage.vue b/client/components/Reader/HistoryPage/HistoryPage.vue
index b49b047c..20819468 100644
--- a/client/components/Reader/HistoryPage/HistoryPage.vue
+++ b/client/components/Reader/HistoryPage/HistoryPage.vue
@@ -36,11 +36,18 @@
                     <el-table-column
                         >
                         <template slot="header" slot-scope="scope"><!-- eslint-disable-line vue/no-unused-vars -->
-                            <el-input
-                                v-model="search"
+                            <!--el-input ref="input"
+                                :value="search" @input="search = $event"
                                 size="mini"
                                 style="margin: 0; padding: 0; vertical-align: bottom; margin-top: 10px"
-                                placeholder="Найти"/>
+                                placeholder="Найти"/-->
+                                <div class="el-input el-input--mini">
+                                    <input class="el-input__inner"
+                                        placeholder="Найти"
+                                        style="margin: 0; padding: 0; vertical-align: bottom; margin-top: 20px; padding: 0 10px 0 10px"
+                                        :value="search" @input="search = $event.target.value"
+                                    />
+                                </div>
                         </template>
 
                         <el-table-column
@@ -146,6 +153,7 @@ class HistoryPage extends Vue {
         return result.filter(item => {
             return !search ||
                 item.touchTime.includes(search) ||
+                item.touchDate.includes(search) ||
                 item.desc.title.toLowerCase().includes(search.toLowerCase()) ||
                 item.desc.author.toLowerCase().includes(search.toLowerCase())
         });
diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 24707af2..c115b0de 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -375,12 +375,12 @@ class Reader extends Vue {
     keyHook(event) {
         if (this.$root.rootRoute == '/reader') {
             let handled = false;
-            if (this.$refs.page && this.$refs.page.keyHook)
-                handled = this.$refs.page.keyHook(event);
-
             if (this.historyActive)
                 handled = this.$refs.historyPage.keyHook(event);
 
+            if (!handled && this.$refs.page && this.$refs.page.keyHook)
+                handled = this.$refs.page.keyHook(event);
+
             if (!handled && event.type == 'keydown') {
                 switch (event.code) {
                     case 'Escape':