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 19:30:04 +07:00
parent 859849b66c
commit fda392f414
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,6 @@
</el-header> </el-header>
<el-main> <el-main>
{{ bookPos }}
<keep-alive> <keep-alive>
<component ref="page" :is="pageActive" @load-book="loadBook" @book-pos-changed="bookPosChanged"></component> <component ref="page" :is="pageActive" @load-book="loadBook" @book-pos-changed="bookPosChanged"></component>
</keep-alive> </keep-alive>
@@ -77,11 +76,16 @@ export default @Component({
} }
} }
}, },
routeParamPos: function(newValue) { routeParamPos: function(newValue) {
if (newValue !== undefined && newValue != this.bookPos) { if (newValue !== undefined && newValue != this.bookPos) {
this.bookPos = newValue; this.bookPos = newValue;
} }
}, },
routeParamUrl: function(newValue) {
if (newValue !== '' && newValue !== this.lastOpenedBook.url) {
this.loadBook({url: newValue});
}
}
}, },
}) })
class Reader extends Vue { class Reader extends Vue {
@@ -199,6 +203,7 @@ class Reader extends Vue {
this.bookPos = last.bookPos; this.bookPos = last.bookPos;
} }
this.updateRoute();
const textPage = this.$refs.page; const textPage = this.$refs.page;
textPage.lastBook = last; textPage.lastBook = last;
@@ -226,9 +231,12 @@ class Reader extends Vue {
}); });
if (bookParsed) { if (bookParsed) {
this.commit('reader/setOpenedBook', bookManager.metaOnly(bookParsed)); let isOpened = this.reader.openedBook[bookParsed.key];
this.bookPos = bookParsed.bookPos; isOpened = (isOpened ? isOpened : {});
this.updateRoute();
const bookPos = (opts.bookPos !== undefined ? opts.bookPos : isOpened.bookPos);
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;
return; return;
@@ -245,12 +253,13 @@ class Reader extends Vue {
progress.setState({progress: prog}); progress.setState({progress: prog});
}); });
this.commit('reader/setOpenedBook', bookManager.metaOnly(addedBook)); let isOpened = this.reader.openedBook[addedBook.key];
this.bookPos = opts.bookPos; isOpened = (isOpened ? isOpened : {});
this.updateRoute();
const bookPos = (opts.bookPos !== undefined ? opts.bookPos : isOpened.bookPos);
this.commit('reader/setOpenedBook', Object.assign({bookPos}, bookManager.metaOnly(addedBook)));
this.loaderActive = false; this.loaderActive = false;
progress.hide(); this.progressActive = false; progress.hide(); this.progressActive = false;
} catch (e) { } catch (e) {
progress.hide(); this.progressActive = false; progress.hide(); this.progressActive = false;