diff --git a/client/components/App.vue b/client/components/App.vue index f81b9f21..799234d1 100644 --- a/client/components/App.vue +++ b/client/components/App.vue @@ -90,6 +90,18 @@ class App extends Vue { this.uistate = this.$store.state.uistate; this.config = this.$store.state.config; + //root route + let cachedRoute = ''; + let cachedPath = ''; + this.$root.rootRoute = () => { + if (this.$route.path != cachedPath) { + cachedPath = this.$route.path; + const m = cachedPath.match(/^(\/[^/]*).*$/i); + cachedRoute = (m ? m[1] : this.$route.path); + } + return cachedRoute; + } + // set-app-title this.$root.$on('set-app-title', this.setAppTitle); @@ -178,10 +190,7 @@ class App extends Vue { } get rootRoute() { - const m = this.$route.path.match(/^(\/[^/]*).*$/i); - this.$root.rootRoute = (m ? m[1] : this.$route.path); - - return this.$root.rootRoute; + return this.$root.rootRoute(); } setAppTitle(title) { diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index b97aa182..cc2543cc 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -302,8 +302,8 @@ class Reader extends Vue { (async() => { await bookManager.init(this.settings); bookManager.addEventListener(this.bookManagerEvent); - - if (this.$root.rootRoute == '/reader') { + + if (this.$root.rootRoute() == '/reader') { if (this.routeParamUrl) { await this.loadBook({url: this.routeParamUrl, bookPos: this.routeParamPos, force: this.routeParamRefresh}); } else { @@ -1086,7 +1086,7 @@ class Reader extends Vue { } keyHook(event) { - if (this.$root.rootRoute == '/reader') { + if (this.$root.rootRoute() == '/reader') { let handled = false; if (!handled && this.helpActive) handled = this.$refs.helpPage.keyHook(event);