From eb02309bca969889bdfceaf88d2ef96934ab34dc Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 13 Jan 2019 19:02:42 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B3=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/api/reader.js                                   | 3 ++-
 client/components/Reader/LoaderPage/LoaderPage.vue     | 4 +++-
 client/components/Reader/ProgressPage/ProgressPage.vue | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/api/reader.js b/client/api/reader.js
index 0254893e..c83df6eb 100644
--- a/client/api/reader.js
+++ b/client/api/reader.js
@@ -11,7 +11,7 @@ const workerApi = axios.create({
 
 class Reader {
     async loadBook(url, callback) {
-        const refreshPause = 100;
+        const refreshPause = 200;
 
         let response = await api.post('/load-book', {type: 'url', url});
 
@@ -41,6 +41,7 @@ class Reader {
                 let errMes = response.data.error;
                 if (errMes.indexOf('getaddrinfo') >= 0 || 
                     errMes.indexOf('ECONNRESET') >= 0 ||
+                    errMes.indexOf('EINVAL') >= 0 ||
                     errMes.indexOf('404') >= 0)
                     errMes = `Ресурс не найден по адресу: ${response.data.url}`;
                 throw new Error(errMes);
diff --git a/client/components/Reader/LoaderPage/LoaderPage.vue b/client/components/Reader/LoaderPage/LoaderPage.vue
index c3fff633..c9f12a03 100644
--- a/client/components/Reader/LoaderPage/LoaderPage.vue
+++ b/client/components/Reader/LoaderPage/LoaderPage.vue
@@ -76,6 +76,7 @@ class LoaderPage extends Vue {
                 this.progress.hide();
             } catch (e) {
                 this.progress.hide();
+                this.$refs.input.blur();
                 this.$alert(e.message, 'Ошибка', {type: 'error'});
             }
         }
@@ -93,8 +94,9 @@ class LoaderPage extends Vue {
 
     keyHook(event) {
         //недостатки сторонних ui
-        if (document.activeElement == this.$refs.input.$refs.input && event.type == 'keyup' && event.key == 'Enter')
+        if (document.activeElement === this.$refs.input.$refs.input && event.type == 'keyup' && event.key == 'Enter') {
             this.submitUrl();
+        }
     }
 }
 //-----------------------------------------------------------------------------
diff --git a/client/components/Reader/ProgressPage/ProgressPage.vue b/client/components/Reader/ProgressPage/ProgressPage.vue
index 9a9589c9..74553ed2 100644
--- a/client/components/Reader/ProgressPage/ProgressPage.vue
+++ b/client/components/Reader/ProgressPage/ProgressPage.vue
@@ -15,6 +15,7 @@ import Component from 'vue-class-component';
 const ruMessage = {
     'start': ' ',
     'finish': ' ',
+    'error': ' ',
     'download': 'скачивание',
     'decompress': 'распаковка',
     'convert': 'конвертирование',