diff --git a/client/components/Reader/HelpPage/HelpPage.vue b/client/components/Reader/HelpPage/HelpPage.vue index 33d5d87c..8278affa 100644 --- a/client/components/Reader/HelpPage/HelpPage.vue +++ b/client/components/Reader/HelpPage/HelpPage.vue @@ -29,14 +29,14 @@ import CommonHelpPage from './CommonHelpPage/CommonHelpPage.vue'; import HotkeysHelpPage from './HotkeysHelpPage/HotkeysHelpPage.vue'; import MouseHelpPage from './MouseHelpPage/MouseHelpPage.vue'; import VersionHistoryPage from './VersionHistoryPage/VersionHistoryPage.vue'; -import DonateHelpPage from './DonateHelpPage/DonateHelpPage.vue'; +//import DonateHelpPage from './DonateHelpPage/DonateHelpPage.vue'; const pages = { 'CommonHelpPage': CommonHelpPage, 'HotkeysHelpPage': HotkeysHelpPage, 'MouseHelpPage': MouseHelpPage, 'VersionHistoryPage': VersionHistoryPage, - 'DonateHelpPage': DonateHelpPage, + //'DonateHelpPage': DonateHelpPage, }; const tabs = [ @@ -44,7 +44,7 @@ const tabs = [ ['MouseHelpPage', 'Мышь/тачскрин'], ['HotkeysHelpPage', 'Клавиатура'], ['VersionHistoryPage', 'История версий'], - ['DonateHelpPage', 'Помочь проекту'], + //['DonateHelpPage', 'Помочь проекту'], ]; const componentOptions = { @@ -73,7 +73,7 @@ class HelpPage { } activateDonateHelpPage() { - this.selectedTab = 'DonateHelpPage'; + //this.selectedTab = 'DonateHelpPage'; } activateVersionHistoryHelpPage() { diff --git a/client/components/Reader/LoaderPage/LoaderPage.vue b/client/components/Reader/LoaderPage/LoaderPage.vue index 831722e9..5cb2d48a 100644 --- a/client/components/Reader/LoaderPage/LoaderPage.vue +++ b/client/components/Reader/LoaderPage/LoaderPage.vue @@ -46,7 +46,7 @@
Справка - Помочь проекту + v{{ version }} Версия сервера {{ version }}, версия клиента {{ clientVersion }}, необходимо обновить страницу @@ -136,7 +136,7 @@ class LoaderPage { } loadBufferClick() { - this.pasteTextToggle(); + this.showPasteText(); } loadBuffer(opts) { @@ -146,6 +146,10 @@ class LoaderPage { } } + showPasteText() { + this.pasteTextActive = true; + } + pasteTextToggle() { this.pasteTextActive = !this.pasteTextActive; } diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index 7bf95559..0a1a4f83 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -9,6 +9,13 @@ {{ rstore.readerActions['loader'] }} + +
@@ -889,6 +896,7 @@ class Reader { switch (action) { case 'loader': + case 'help': case 'fullScreen': case 'setPosition': case 'search': diff --git a/client/components/Reader/ReaderDialogs/ReaderDialogs.vue b/client/components/Reader/ReaderDialogs/ReaderDialogs.vue index 179ff713..58a77149 100644 --- a/client/components/Reader/ReaderDialogs/ReaderDialogs.vue +++ b/client/components/Reader/ReaderDialogs/ReaderDialogs.vue @@ -54,9 +54,9 @@

- +
diff --git a/client/store/modules/reader.js b/client/store/modules/reader.js index f143f410..fe9996da 100644 --- a/client/store/modules/reader.js +++ b/client/store/modules/reader.js @@ -35,6 +35,7 @@ const readerActions = { //readerActions[name] const toolButtons = [ + {name: 'help', show: true}, {name: 'undoAction', show: true}, {name: 'redoAction', show: true}, {name: 'fullScreen', show: true},