diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index 979938d3..5657d24b 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -2,10 +2,12 @@
- +
+ +
-
- +
+ + +
@@ -230,6 +238,7 @@ export default @Component({ class Reader extends Vue { rstore = {}; loaderActive = false; + offlineModeActive = false; progressActive = false; fullScreenActive = false; @@ -237,8 +246,8 @@ class Reader extends Vue { setPositionActive = false; searchActive = false; copyTextActive = false; + libsActive = false; recentBooksActive = false; - offlineModeActive = false; settingsActive = false; helpActive = false; clickMapActive = false; @@ -587,7 +596,7 @@ class Reader extends Vue { } } - closeAllTextPages() { + closeAllWindows() { this.setPositionActive = false; this.copyTextActive = false; this.recentBooksActive = false; @@ -600,7 +609,7 @@ class Reader extends Vue { loaderToggle() { this.loaderActive = !this.loaderActive; if (this.loaderActive) { - this.closeAllTextPages(); + this.closeAllWindows(); } } @@ -608,7 +617,7 @@ class Reader extends Vue { this.setPositionActive = !this.setPositionActive; const page = this.$refs.page; if (this.setPositionActive && this.activePage == 'TextPage' && page.parsed) { - this.closeAllTextPages(); + this.closeAllWindows(); this.setPositionActive = true; this.$nextTick(() => { @@ -660,7 +669,7 @@ class Reader extends Vue { this.searchActive = !this.searchActive; const page = this.$refs.page; if (this.searchActive && this.activePage == 'TextPage' && page.parsed) { - this.closeAllTextPages(); + this.closeAllWindows(); this.searchActive = true; this.$nextTick(() => { @@ -676,7 +685,7 @@ class Reader extends Vue { this.copyTextActive = !this.copyTextActive; const page = this.$refs.page; if (this.copyTextActive && this.activePage == 'TextPage' && page.parsed) { - this.closeAllTextPages(); + this.closeAllWindows(); this.copyTextActive = true; this.$nextTick(() => { @@ -694,7 +703,7 @@ class Reader extends Vue { recentBooksToggle() { this.recentBooksActive = !this.recentBooksActive; if (this.recentBooksActive) { - this.closeAllTextPages(); + this.closeAllWindows(); this.$refs.recentBooksPage.init(); this.recentBooksActive = true; } else { @@ -710,7 +719,7 @@ class Reader extends Vue { settingsToggle() { this.settingsActive = !this.settingsActive; if (this.settingsActive) { - this.closeAllTextPages(); + this.closeAllWindows(); this.settingsActive = true; this.$nextTick(() => { @@ -724,7 +733,7 @@ class Reader extends Vue { helpToggle() { this.helpActive = !this.helpActive; if (this.helpActive) { - this.closeAllTextPages(); + this.closeAllWindows(); this.helpActive = true; } } @@ -791,8 +800,9 @@ class Reader extends Vue { case 'search': case 'copyText': case 'refresh': - case 'offlineMode': + case 'libs': case 'recentBooks': + case 'offlineMode': case 'settings': if (this.progressActive) { classResult = classDisabled; @@ -896,7 +906,7 @@ class Reader extends Vue { return; } - this.closeAllTextPages(); + this.closeAllWindows(); let url = encodeURI(decodeURI(opts.url)); @@ -1071,9 +1081,6 @@ class Reader extends Vue { case 'help': this.helpToggle(); break; - case 'settings': - this.settingsToggle(); - break; case 'undoAction': this.undoAction(); break; @@ -1101,12 +1108,18 @@ class Reader extends Vue { case 'refresh': this.refreshBook(); break; - case 'offlineMode': - this.offlineModeToggle(); + case 'libs': + this.libsToogle(); break; case 'recentBooks': this.recentBooksToggle(); break; + case 'offlineMode': + this.offlineModeToggle(); + break; + case 'settings': + this.settingsToggle(); + break; case 'switchToolbar': this.toolBarToggle(); break; diff --git a/client/store/modules/reader.js b/client/store/modules/reader.js index 1cd342da..4ba12b4b 100644 --- a/client/store/modules/reader.js +++ b/client/store/modules/reader.js @@ -12,6 +12,7 @@ const readerActions = { 'copyText': 'Скопировать текст со страницы', 'refresh': 'Принудительно обновить книгу', 'offlineMode': 'Автономный режим (без интернета)', + 'libs': 'Библиотеки', 'recentBooks': 'Открыть недавние', 'switchToolbar': 'Показать/скрыть панель управления', 'donate': '', @@ -37,8 +38,9 @@ const toolButtons = [ {name: 'search', show: true}, {name: 'copyText', show: false}, {name: 'refresh', show: true}, - {name: 'offlineMode', show: false}, + {name: 'libs', show: true}, {name: 'recentBooks', show: true}, + {name: 'offlineMode', show: false}, ]; //readerActions[name] @@ -55,6 +57,7 @@ const hotKeys = [ {name: 'copyText', codes: ['Ctrl+C']}, {name: 'refresh', codes: ['R']}, {name: 'offlineMode', codes: ['O']}, + {name: 'libs', codes: ['L']}, {name: 'recentBooks', codes: ['X']}, {name: 'switchToolbar', codes: ['Tab', 'Q']},