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 20:04:48 +07:00
parent fda392f414
commit 04212f5646
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,7 +197,7 @@ class Reader extends Vue {
const isParsed = await bookManager.hasBookParsed(last); const isParsed = await bookManager.hasBookParsed(last);
if (!isParsed) { if (!isParsed) {
this.$root.$emit('set-app-title'); this.$root.$emit('set-app-title');
this.loadBook({url: last.url, bookPos: last.bookPos}); this.loadBook({url: last.url});
return; return;
} else { } else {
this.bookPos = last.bookPos; this.bookPos = last.bookPos;
@@ -205,11 +205,12 @@ class Reader extends Vue {
this.updateRoute(); this.updateRoute();
const textPage = this.$refs.page; const textPage = this.$refs.page;
if (textPage.showBook) {
textPage.lastBook = last;
textPage.bookPos = (this.bookPos !== undefined ? this.bookPos : 0);
textPage.lastBook = last; textPage.showBook();
textPage.bookPos = (this.bookPos !== undefined ? this.bookPos : 0); }
textPage.showBook();
}); });
} }
@@ -226,15 +227,17 @@ class Reader extends Vue {
progress.show(); progress.show();
progress.setState({state: 'parse'}); progress.setState({state: 'parse'});
const key = bookManager.keyFromUrl(opts.url);
let wasOpened = this.reader.openedBook[key];
wasOpened = (wasOpened ? wasOpened : {});
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) {
let isOpened = this.reader.openedBook[bookParsed.key];
isOpened = (isOpened ? isOpened : {});
const bookPos = (opts.bookPos !== undefined ? opts.bookPos : isOpened.bookPos); 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;
@@ -253,10 +256,7 @@ class Reader extends Vue {
progress.setState({progress: prog}); progress.setState({progress: prog});
}); });
let isOpened = this.reader.openedBook[addedBook.key]; const bookPos = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos);
isOpened = (isOpened ? isOpened : {});
const bookPos = (opts.bookPos !== undefined ? opts.bookPos : isOpened.bookPos);
this.commit('reader/setOpenedBook', Object.assign({bookPos}, bookManager.metaOnly(addedBook))); this.commit('reader/setOpenedBook', Object.assign({bookPos}, bookManager.metaOnly(addedBook)));
this.loaderActive = false; this.loaderActive = false;