From 9adcec2d21842227a04d3ac074331c7b4e7edc6c Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 6 Feb 2019 00:27:04 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=B4=20HelpPage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/App.vue | 7 ++ .../CommonHelpPage/CommonHelpPage.vue | 70 +++++++++++++++ .../components/Reader/HelpPage/HelpPage.vue | 85 +++++++++++++++++++ .../Reader/LoaderPage/LoaderPage.vue | 1 + client/components/Reader/Reader.vue | 17 ++++ 5 files changed, 180 insertions(+) create mode 100644 client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue create mode 100644 client/components/Reader/HelpPage/HelpPage.vue diff --git a/client/components/App.vue b/client/components/App.vue index d9ee628a..ea3bb82a 100644 --- a/client/components/App.vue +++ b/client/components/App.vue @@ -263,6 +263,13 @@ body, html, #app { font: normal 12pt ReaderDefault; } +.el-tabs__content { + flex: 1; + padding: 0 !important; + display: flex; + flex-direction: column; +} + @font-face { font-family: 'ReaderDefault'; src: url('fonts/reader-default.woff') format('woff'), diff --git a/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue new file mode 100644 index 00000000..121bf3dc --- /dev/null +++ b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/client/components/Reader/HelpPage/HelpPage.vue b/client/components/Reader/HelpPage/HelpPage.vue new file mode 100644 index 00000000..aa11b5aa --- /dev/null +++ b/client/components/Reader/HelpPage/HelpPage.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/client/components/Reader/LoaderPage/LoaderPage.vue b/client/components/Reader/LoaderPage/LoaderPage.vue index 87844ad1..2184ff16 100644 --- a/client/components/Reader/LoaderPage/LoaderPage.vue +++ b/client/components/Reader/LoaderPage/LoaderPage.vue @@ -78,6 +78,7 @@ class LoaderPage extends Vue { } openHelp() { + this.$emit('help-toggle'); } openDonate() { diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index b80a15dc..2cede698 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -56,6 +56,7 @@ @full-screen-toogle="fullScreenToggle" @stop-scrolling="stopScrolling" @scrolling-toggle="scrollingToggle" + @help-toggle="helpToggle" > @@ -69,6 +70,7 @@ + @@ -86,6 +88,7 @@ import SearchPage from './SearchPage/SearchPage.vue'; import CopyTextPage from './CopyTextPage/CopyTextPage.vue'; import HistoryPage from './HistoryPage/HistoryPage.vue'; import SettingsPage from './SettingsPage/SettingsPage.vue'; +import HelpPage from './HelpPage/HelpPage.vue'; import bookManager from './share/bookManager'; import readerApi from '../../api/reader'; @@ -103,6 +106,7 @@ export default @Component({ CopyTextPage, HistoryPage, SettingsPage, + HelpPage, }, watch: { bookPos: function(newValue) { @@ -142,6 +146,7 @@ class Reader extends Vue { copyTextActive = false; historyActive = false; settingsActive = false; + helpActive = false; bookPos = null; allowUrlParamBookPos = false; @@ -298,6 +303,7 @@ class Reader extends Vue { this.settingsActive = false; this.stopScrolling(); this.stopSearch(); + this.helpActive = false; } loaderToggle() { @@ -405,6 +411,14 @@ class Reader extends Vue { } } + helpToggle() { + this.helpActive = !this.helpActive; + if (this.helpActive) { + this.closeAllTextPages(); + this.helpActive = true; + } + } + buttonClick(button) { switch (button) { case 'loader': @@ -699,6 +713,9 @@ class Reader extends Vue { keyHook(event) { if (this.$root.rootRoute == '/reader') { let handled = false; + if (!handled && this.helpActive) + handled = this.$refs.helpPage.keyHook(event); + if (!handled && this.settingsActive) handled = this.$refs.settingsPage.keyHook(event);