deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Мелкий рефакторинг

Browse Source
This commit is contained in:
Book Pauk
2019-01-15 22:01:19 +07:00
parent e131bc7bc9
commit a2e32ed85f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/components/Reader/Reader.vue
View File

@@ -236,13 +236,13 @@ class Reader extends Vue {
const key = bookManager.keyFromUrl(opts.url); const key = bookManager.keyFromUrl(opts.url);
let wasOpened = this.reader.openedBook[key]; let wasOpened = this.reader.openedBook[key];
wasOpened = (wasOpened ? wasOpened : {}); wasOpened = (wasOpened ? wasOpened : {});
const bookPos = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos);
const bookParsed = await bookManager.getBook({url: opts.url}, (prog) => { const bookParsed = await bookManager.getBook({url: opts.url}, (prog) => {
progress.setState({progress: prog}); progress.setState({progress: prog});
}); });
if (bookParsed) { if (bookParsed) {
const bookPos = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos);
this.commit('reader/setOpenedBook', Object.assign({bookPos}, bookManager.metaOnly(bookParsed))); this.commit('reader/setOpenedBook', Object.assign({bookPos}, bookManager.metaOnly(bookParsed)));
this.loaderActive = false; this.loaderActive = false;
progress.hide(); this.progressActive = false; progress.hide(); this.progressActive = false;
@@ -260,7 +260,6 @@ class Reader extends Vue {
progress.setState({progress: prog}); progress.setState({progress: prog});
}); });
const bookPos = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos);
this.commit('reader/setOpenedBook', Object.assign({bookPos}, bookManager.metaOnly(addedBook))); this.commit('reader/setOpenedBook', Object.assign({bookPos}, bookManager.metaOnly(addedBook)));
this.updateRoute(true); this.updateRoute(true);