From bfb37e55d46f2844fab0253b29dfa0d92321eac7 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Thu, 17 Oct 2019 19:18:56 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B5=D1=81=D1=81?= =?UTF-8?q?=D0=B1=D0=B0=D1=80=D0=B0=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=BA=D0=BD=D0=B8=D0=B3=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/api/reader.js | 5 ++--- client/components/Reader/Reader.vue | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/api/reader.js b/client/api/reader.js index b8081bd8..7d45eada 100644 --- a/client/api/reader.js +++ b/client/api/reader.js @@ -1,6 +1,4 @@ -import _ from 'lodash'; import axios from 'axios'; -import {Buffer} from 'safe-buffer'; import * as utils from '../share/utils'; @@ -66,12 +64,13 @@ class Reader { estSize = response.headers['content-length']; } + callback({state: 'loading', progress: 0}); const options = { onDownloadProgress: progress => { while (progress.loaded > estSize) estSize *= 1.5; if (callback) - callback({state: 'loading', progress: Math.round((progress.loaded*100)/estSize)}); + callback({progress: Math.round((progress.loaded*100)/estSize)}); } } //загрузка diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index 762198a7..cd997ea5 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -984,6 +984,7 @@ class Reader extends Vue { // иначе идем на сервер // пытаемся загрузить готовый файл с сервера if (wasOpened.path) { + progress.setState({totalSteps: 5}); try { const resp = await readerApi.loadCachedBook(wasOpened.path, (state) => { progress.setState(state);