diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 4974d1d0..314d2a5a 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -41,7 +41,7 @@
-
+
@@ -56,9 +56,9 @@
>
-
-
+
+
@@ -71,8 +71,9 @@ import LoaderPage from './LoaderPage/LoaderPage.vue';
import TextPage from './TextPage/TextPage.vue';
import ProgressPage from './ProgressPage/ProgressPage.vue';
-import HistoryPage from './HistoryPage/HistoryPage.vue';
import SetPositionPage from './SetPositionPage/SetPositionPage.vue';
+import HistoryPage from './HistoryPage/HistoryPage.vue';
+import SettingsPage from './SettingsPage/SettingsPage.vue';
import bookManager from './share/bookManager';
import readerApi from '../../api/reader';
@@ -83,8 +84,10 @@ export default @Component({
LoaderPage,
TextPage,
ProgressPage,
- HistoryPage,
+
SetPositionPage,
+ HistoryPage,
+ SettingsPage,
},
watch: {
bookPos: function(newValue) {
@@ -115,11 +118,12 @@ class Reader extends Vue {
progressActive = false;
fullScreenActive = false;
+ setPositionActive = false;
scrollingActive = false;
searchActive = false;
copyTextActive = false;
historyActive = false;
- setPositionActive = false;
+ settingsActive = false;
bookPos = null;
allowUrlParamBookPos = true;
@@ -232,8 +236,9 @@ class Reader extends Vue {
}
closeAllTextPages() {
- this.historyActive = false;
this.setPositionActive = false;
+ this.historyActive = false;
+ this.settingsActive = false;
}
loaderToggle() {
@@ -243,16 +248,6 @@ class Reader extends Vue {
}
}
- historyToggle() {
- this.historyActive = !this.historyActive;
- if (this.historyActive) {
- this.closeAllTextPages();
- this.historyActive = true;
- } else {
- this.historyActive = false;
- }
- }
-
setPositionToggle() {
this.setPositionActive = !this.setPositionActive;
if (this.setPositionActive && this.activePage == 'TextPage' && this.lastOpenedBook) {
@@ -268,6 +263,26 @@ class Reader extends Vue {
}
}
+ historyToggle() {
+ this.historyActive = !this.historyActive;
+ if (this.historyActive) {
+ this.closeAllTextPages();
+ this.historyActive = true;
+ } else {
+ this.historyActive = false;
+ }
+ }
+
+ settingsToggle() {
+ this.settingsActive = !this.settingsActive;
+ if (this.settingsActive) {
+ this.closeAllTextPages();
+ this.settingsActive = true;
+ } else {
+ this.settingsActive = false;
+ }
+ }
+
buttonClick(button) {
switch (button) {
case 'loader':
@@ -276,17 +291,20 @@ class Reader extends Vue {
case 'fullScreen':
this.fullScreenToggle();
break;
- case 'history':
- this.historyToggle();
- break;
case 'setPosition':
this.setPositionToggle();
break;
+ case 'history':
+ this.historyToggle();
+ break;
case 'refresh':
if (this.lastOpenedBook) {
this.loadBook({url: this.lastOpenedBook.url, force: true});
}
break;
+ case 'settings':
+ this.settingsToggle();
+ break;
}
this.$refs[button].$el.blur();
}
@@ -304,6 +322,7 @@ class Reader extends Vue {
case 'search':
case 'copyText':
case 'history':
+ case 'settings':
if (this[`${button}Active`])
classResult = classActive;
break;
@@ -486,6 +505,9 @@ class Reader extends Vue {
keyHook(event) {
if (this.$root.rootRoute == '/reader') {
let handled = false;
+ if (!handled && this.settingsActive)
+ handled = this.$refs.settingsPage.keyHook(event);
+
if (!handled && this.historyActive)
handled = this.$refs.historyPage.keyHook(event);
@@ -496,16 +518,21 @@ class Reader extends Vue {
handled = this.$refs.page.keyHook(event);
if (!handled && event.type == 'keydown') {
- switch (event.code) {
- case 'Escape':
- this.loaderToggle();
- break;
- case 'KeyH':
- this.historyToggle();
- break;
- case 'KeyP':
- this.setPositionToggle();
- break;
+ if (event.code == 'Escape')
+ this.loaderToggle();
+
+ if (this.activePage == 'TextPage') {
+ switch (event.code) {
+ case 'KeyP':
+ this.setPositionToggle();
+ break;
+ case 'KeyH':
+ this.historyToggle();
+ break;
+ case 'KeyS':
+ this.settingsToggle();
+ break;
+ }
}
}
}
diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue
new file mode 100644
index 00000000..04ca4db7
--- /dev/null
+++ b/client/components/Reader/SettingsPage/SettingsPage.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+ Настройки
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file