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..ac86d823 100644
--- a/client/components/Reader/LoaderPage/LoaderPage.vue
+++ b/client/components/Reader/LoaderPage/LoaderPage.vue
@@ -22,11 +22,13 @@
+
Загрузить файл с диска
+
Из буфера обмена
@@ -46,7 +48,7 @@
Справка
- Помочь проекту
+
v{{ version }}
Версия сервера {{ version }}, версия клиента {{ clientVersion }}, необходимо обновить страницу
@@ -64,6 +66,7 @@ import GithubCorner from './GithubCorner/GithubCorner.vue';
import PasteTextPage from './PasteTextPage/PasteTextPage.vue';
import {versionHistory} from '../versionHistory';
+import * as utils from '../../../share/utils';
const componentOptions = {
components: {
@@ -136,7 +139,7 @@ class LoaderPage {
}
loadBufferClick() {
- this.pasteTextToggle();
+ this.showPasteText();
}
loadBuffer(opts) {
@@ -146,6 +149,10 @@ class LoaderPage {
}
}
+ showPasteText() {
+ this.pasteTextActive = true;
+ }
+
pasteTextToggle() {
this.pasteTextActive = !this.pasteTextActive;
}
@@ -166,8 +173,9 @@ class LoaderPage {
window.open('http://old.omnireader.ru', '_blank');
}
- onInputKeydown(event) {
+ async onInputKeydown(event) {
if (event.key == 'Enter') {
+ await utils.sleep(100);
this.submitUrl();
}
}
@@ -178,14 +186,8 @@ class LoaderPage {
}
const input = this.$refs.input.getNativeElement();
- if (event.type == 'keydown' && document.activeElement !== input) {
- const action = this.$root.readerActionByKeyEvent(event);
- switch (action) {
- case 'help':
- this.openHelp(event);
- return true;
- }
- }
+ if (event.type == 'keydown' && (document.activeElement === input || event.code == 'Enter') && event.code != 'Escape')
+ return true;
return false;
}
diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 6fbe1c22..827e3530 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -9,6 +9,24 @@
{{ rstore.readerActions['loader'] }}
+
+
+
@@ -89,6 +107,12 @@
+
@@ -68,6 +68,27 @@
+
+
@@ -95,6 +116,7 @@ class ReaderDialogs {
whatsNewVisible = false;
whatsNewContent = '';
donationVisible = false;
+ urlHelpVisible = false;
created() {
this.commit = this.$store.commit;
@@ -135,6 +157,14 @@ class ReaderDialogs {
}
}
+ async showUrlHelp() {
+ this.urlHelpVisible = true;
+ }
+
+ loadBufferClick() {
+ this.urlHelpVisible = false;
+ }
+
donationDialogDisable() {
this.donationVisible = false;
if (this.showDonationDialog2020) {
@@ -191,7 +221,7 @@ class ReaderDialogs {
}
keyHook() {
- if (this.$refs.dialog1.active || this.$refs.dialog2.active)
+ if (this.$refs.dialog1.active || this.$refs.dialog2.active || this.$refs.dialog3.active)
return true;
return false;
}
diff --git a/client/components/Reader/versionHistory.js b/client/components/Reader/versionHistory.js
index 8960de53..ba30a371 100644
--- a/client/components/Reader/versionHistory.js
+++ b/client/components/Reader/versionHistory.js
@@ -1,4 +1,18 @@
export const versionHistory = [
+{
+ version: '0.11.4',
+ releaseDate: '2022-04-14',
+ showUntil: '2022-04-13',
+ content:
+`
+
+ - небольшие дополнения интерфейса
+ - исправления багов
+
+
+`
+},
+
{
version: '0.11.3',
releaseDate: '2022-03-29',
diff --git a/client/store/modules/reader.js b/client/store/modules/reader.js
index f143f410..1bba8a9b 100644
--- a/client/store/modules/reader.js
+++ b/client/store/modules/reader.js
@@ -2,8 +2,10 @@ import * as utils from '../../share/utils';
import googleFonts from './fonts/fonts.json';
const readerActions = {
- 'help': 'Вызвать cправку',
'loader': 'На страницу загрузки',
+ 'loadFile': 'Загрузить файл с диска',
+ 'loadBuffer': 'Загрузить из буфера обмена',
+ 'help': 'Вызвать cправку',
'settings': 'Настроить',
'undoAction': 'Действие назад',
'redoAction': 'Действие вперед',
@@ -15,6 +17,7 @@ const readerActions = {
'copyText': 'Скопировать текст со страницы',
'convOptions': 'Настроить конвертирование',
'refresh': 'Принудительно обновить книгу',
+ 'clickControl': 'Управление кликом',
'offlineMode': 'Автономный режим (без интернета)',
'contents': 'Оглавление/закладки',
'libs': 'Сетевая библиотека',
@@ -35,6 +38,9 @@ const readerActions = {
//readerActions[name]
const toolButtons = [
+ {name: 'loadFile', show: true},
+ {name: 'loadBuffer', show: true},
+ {name: 'help', show: true},
{name: 'undoAction', show: true},
{name: 'redoAction', show: true},
{name: 'fullScreen', show: true},
@@ -47,13 +53,16 @@ const toolButtons = [
{name: 'contents', show: true},
{name: 'libs', show: true},
{name: 'recentBooks', show: true},
+ {name: 'clickControl', show: false},
{name: 'offlineMode', show: false},
];
//readerActions[name]
const hotKeys = [
- {name: 'help', codes: ['F1', 'H']},
{name: 'loader', codes: ['Escape']},
+ {name: 'loadFile', codes: ['F3']},
+ {name: 'loadBuffer', codes: ['F4']},
+ {name: 'help', codes: ['F1', 'H']},
{name: 'settings', codes: ['S']},
{name: 'undoAction', codes: ['Ctrl+BracketLeft']},
{name: 'redoAction', codes: ['Ctrl+BracketRight']},
@@ -67,6 +76,7 @@ const hotKeys = [
{name: 'contents', codes: ['C']},
{name: 'libs', codes: ['L']},
{name: 'recentBooks', codes: ['X']},
+ {name: 'clickControl', codes: ['Ctrl+B']},
{name: 'offlineMode', codes: ['O']},
{name: 'switchToolbar', codes: ['Tab', 'Q']},
diff --git a/package-lock.json b/package-lock.json
index 13c1ce3c..a7e7ad70 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "Liberama",
- "version": "0.11.2",
+ "version": "0.11.4",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "Liberama",
- "version": "0.11.2",
+ "version": "0.11.4",
"hasInstallScript": true,
"license": "CC0-1.0",
"dependencies": {
diff --git a/package.json b/package.json
index dcfffac9..aaea597a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "Liberama",
- "version": "0.11.3",
+ "version": "0.11.4",
"author": "Book Pauk ",
"license": "CC0-1.0",
"repository": "bookpauk/liberama",