From a30fd57afb631089a5bcbf432d600f2717fb7a2e Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 11 Jan 2019 02:13:46 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=D1=81?=
 =?UTF-8?q?=20keyHook,=20=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8=D0=B9=20=D1=80?=
 =?UTF-8?q?=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=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/App.vue                          |  3 ++-
 client/components/Reader/LoaderPage/LoaderPage.vue | 11 ++++++-----
 client/components/Reader/Reader.vue                |  9 ++++++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/client/components/App.vue b/client/components/App.vue
index 640a47f3..f65fe08a 100644
--- a/client/components/App.vue
+++ b/client/components/App.vue
@@ -142,7 +142,8 @@ class App extends Vue {
 
     get rootRoute() {
         const m = this.$route.path.match(/^(\/[^/]*).*$/i);
-        return (m ? m[1] : this.$route.path);
+        this.$root.rootRoute = (m ? m[1] : this.$route.path);
+        return this.$root.rootRoute;
     }
 
     itemTitleClass(path) {
diff --git a/client/components/Reader/LoaderPage/LoaderPage.vue b/client/components/Reader/LoaderPage/LoaderPage.vue
index ca5d97d3..3f647e78 100644
--- a/client/components/Reader/LoaderPage/LoaderPage.vue
+++ b/client/components/Reader/LoaderPage/LoaderPage.vue
@@ -32,11 +32,6 @@ class LoaderPage extends Vue {
     }
 
     mounted() {
-        //недостатки сторонних ui
-        this.$refs.input.$refs.input.addEventListener('keyup', (event) => {
-            if (event.key == 'Enter')
-                this.submitUrl();
-        });
     }
 
     activated() {
@@ -55,6 +50,12 @@ class LoaderPage extends Vue {
             //loadUrl()
         ;
     }
+
+    keyHook(event) {
+        //недостатки сторонних ui
+        if (document.activeElement == this.$refs.input.$refs.input && event.type == 'keyup' && event.key == 'Enter')
+            this.submitUrl();
+    }
 }
 //-----------------------------------------------------------------------------
 </script>
diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index ada6e0db..efb8bd07 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -43,7 +43,7 @@
 
         <el-main>
             <keep-alive>
-                <component :is="componentActive"></component>
+                <component ref="page" :is="pageActive"></component>
             </keep-alive>
         </el-main>
     </el-container>
@@ -93,7 +93,7 @@ class Reader extends Vue {
         return {};
     }
 
-    get componentActive() {
+    get pageActive() {
         let result = '';
 
         if (this.loaderActive)
@@ -107,7 +107,10 @@ class Reader extends Vue {
     }
 
     keyHook(event) {
-        //console.log(this.componentActive);
+        if (this.$root.rootRoute == '/reader') {
+            if (this.$refs.page && this.$refs.page.keyHook)
+                this.$refs.page.keyHook(event);
+        }
     }
 }
 //-----------------------------------------------------------------------------