diff --git a/client/components/Reader/CopyTextPage/CopyTextPage.vue b/client/components/Reader/CopyTextPage/CopyTextPage.vue index c1ce34b5..b16477c1 100644 --- a/client/components/Reader/CopyTextPage/CopyTextPage.vue +++ b/client/components/Reader/CopyTextPage/CopyTextPage.vue @@ -91,7 +91,7 @@ class CopyTextPage extends Vue { close() { this.stopInit = true; - this.$emit('copy-text-toggle'); + this.$emit('do-action', {action: 'copyText'}); } keyHook(event) { diff --git a/client/components/Reader/HelpPage/HelpPage.vue b/client/components/Reader/HelpPage/HelpPage.vue index f54c25b7..8998c73c 100644 --- a/client/components/Reader/HelpPage/HelpPage.vue +++ b/client/components/Reader/HelpPage/HelpPage.vue @@ -56,7 +56,7 @@ class HelpPage extends Vue { selectedTab = 'CommonHelpPage'; close() { - this.$emit('help-toggle'); + this.$emit('do-action', {action: 'help'}); } get activePage() { diff --git a/client/components/Reader/LoaderPage/LoaderPage.vue b/client/components/Reader/LoaderPage/LoaderPage.vue index 2956b6d9..0b50fd58 100644 --- a/client/components/Reader/LoaderPage/LoaderPage.vue +++ b/client/components/Reader/LoaderPage/LoaderPage.vue @@ -148,12 +148,12 @@ class LoaderPage extends Vue { this.pasteTextActive = !this.pasteTextActive; } - openHelp() { - this.$emit('help-toggle'); + openHelp(event) { + this.$emit('do-action', {action: 'help', event}); } openDonate() { - this.$emit('donate-toggle'); + this.$emit('do-action', {action: 'donate'}); } openComments() { @@ -180,9 +180,7 @@ class LoaderPage extends Vue { const action = this.$root.readerActionByKeyEvent(event); switch (action) { case 'help': - this.$emit('help-toggle'); - event.preventDefault(); - event.stopPropagation(); + this.openHelp(event); return true; } } diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index 821a3517..6c837fe3 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -66,25 +66,20 @@ @load-file="loadFile" @book-pos-changed="bookPosChanged" @do-action="doAction" - - @scrolling-toggle="scrollingToggle" - @help-toggle="helpToggle" - @donate-toggle="donateToggle" > - + - - + + diff --git a/client/components/Reader/SearchPage/SearchPage.vue b/client/components/Reader/SearchPage/SearchPage.vue index 08396b88..8b84f306 100644 --- a/client/components/Reader/SearchPage/SearchPage.vue +++ b/client/components/Reader/SearchPage/SearchPage.vue @@ -164,7 +164,7 @@ class SearchPage extends Vue { close() { this.stopInit = true; - this.$emit('search-toggle'); + this.$emit('do-action', {action: 'search'}); } inputKeyDown(event) { diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue index dbaf6018..09fecc55 100644 --- a/client/components/Reader/SettingsPage/SettingsPage.vue +++ b/client/components/Reader/SettingsPage/SettingsPage.vue @@ -345,7 +345,7 @@ class SettingsPage extends Vue { } close() { - this.$emit('settings-toggle'); + this.$emit('do-action', {action: 'settings'}); } async setDefaults() {