From c20aa089fa87f3540a6e9ebe7dd624eed2a87823 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 29 Mar 2022 17:45:57 +0700 Subject: [PATCH 1/8] npm --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 13c1ce3c..c5c48e88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "Liberama", - "version": "0.11.2", + "version": "0.11.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "Liberama", - "version": "0.11.2", + "version": "0.11.3", "hasInstallScript": true, "license": "CC0-1.0", "dependencies": { From 7c73c74730d685ddee5bc39bf9b7a25581db1d9a Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Thu, 14 Apr 2022 17:13:38 +0700 Subject: [PATCH 2/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D1=81=D0=BA=D0=B0=D0=B7=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B5=D0=B2=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D0=B4=D0=BD=D0=BE=D0=BC=20URL=20=D0=BA=D0=BD=D0=B8=D0=B3?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/Reader.vue | 21 ++++++++++++- .../Reader/ReaderDialogs/ReaderDialogs.vue | 31 ++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index 6fbe1c22..7bf95559 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -393,6 +393,23 @@ class Reader { this.loadWallpapers();//no await } + showHelpOnErrorIfNeeded(errorMessage) { + //небольшая эвристика + let i = errorMessage.indexOf('http://'); + if (i < 0) + i = errorMessage.indexOf('https://'); + + errorMessage = errorMessage.substring(i + 7); + const perCount = errorMessage.split('%').length - 1; + + if (perCount > errorMessage.length/3.2) { + this.$refs.dialogs.showUrlHelp(); + return true; + } + + return false; + } + //wallpaper css async loadWallpapers() { const wallpaperDataLength = await wallpaperStorage.getLength(); @@ -1117,7 +1134,9 @@ class Reader { } catch (e) { progress.hide(); this.progressActive = false; this.loaderActive = true; - this.$root.stdDialog.alert(e.message, 'Ошибка', {color: 'negative'}); + if (!this.showHelpOnErrorIfNeeded(e.message)) { + this.$root.stdDialog.alert(e.message, 'Ошибка', {color: 'negative'}); + } } finally { this.checkNewVersionAvailable(); } diff --git a/client/components/Reader/ReaderDialogs/ReaderDialogs.vue b/client/components/Reader/ReaderDialogs/ReaderDialogs.vue index 52f64320..179ff713 100644 --- a/client/components/Reader/ReaderDialogs/ReaderDialogs.vue +++ b/client/components/Reader/ReaderDialogs/ReaderDialogs.vue @@ -68,6 +68,26 @@ + + + + +
+ Если вы хотите найти определенную книгу и открыть в читалке, добро пожаловать в + раздел "Сетевая библиотека" (кнопка ) на сайте + liberama.top + +

+ Если же вы пытаетесь вставить текст в читалку из буфера обмена, пожалуйста воспользуйтесь кнопкой + + Из буфера обмена + + на странице загрузки. +
+ @@ -95,6 +115,7 @@ class ReaderDialogs { whatsNewVisible = false; whatsNewContent = ''; donationVisible = false; + urlHelpVisible = false; created() { this.commit = this.$store.commit; @@ -135,6 +156,14 @@ class ReaderDialogs { } } + async showUrlHelp() { + this.urlHelpVisible = true; + } + + loadBufferClick() { + this.urlHelpVisible = false; + } + donationDialogDisable() { this.donationVisible = false; if (this.showDonationDialog2020) { @@ -191,7 +220,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; } From b4ee9d6c005ca21842156e4a7c0a982ae6e33f1b Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Thu, 14 Apr 2022 17:27:29 +0700 Subject: [PATCH 3/8] =?UTF-8?q?=D0=A1=D0=BA=D1=80=D1=8B=D1=82=D0=B0=20?= =?UTF-8?q?=D0=BE=D0=BF=D1=86=D0=B8=D1=8F=20"=D0=9F=D0=BE=D0=BC=D0=BE?= =?UTF-8?q?=D1=87=D1=8C=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D1=83".=20?= =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BA?= =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20"=D0=92=D1=8B=D0=B7=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D1=83?= =?UTF-8?q?".?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/HelpPage/HelpPage.vue | 8 ++++---- client/components/Reader/LoaderPage/LoaderPage.vue | 8 ++++++-- client/components/Reader/Reader.vue | 8 ++++++++ client/components/Reader/ReaderDialogs/ReaderDialogs.vue | 4 ++-- client/store/modules/reader.js | 1 + 5 files changed, 21 insertions(+), 8 deletions(-) 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}, From 4fdaf5f555de1d0d9e28aa68338a1fab33dd0770 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Thu, 14 Apr 2022 17:48:51 +0700 Subject: [PATCH 4/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20'=D0=97?= =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=B8=D1=82=D1=8C=20=D1=84=D0=B0?= =?UTF-8?q?=D0=B9=D0=BB=20=D1=81=20=D0=B4=D0=B8=D1=81=D0=BA=D0=B0'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reader/LoaderPage/LoaderPage.vue | 1 + client/components/Reader/Reader.vue | 24 ++++++++++++++++++- client/store/modules/reader.js | 7 ++++-- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/client/components/Reader/LoaderPage/LoaderPage.vue b/client/components/Reader/LoaderPage/LoaderPage.vue index 5cb2d48a..32a4ca52 100644 --- a/client/components/Reader/LoaderPage/LoaderPage.vue +++ b/client/components/Reader/LoaderPage/LoaderPage.vue @@ -22,6 +22,7 @@
+ Загрузить файл с диска diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index 0a1a4f83..24dbfbd9 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -10,7 +10,14 @@ - + + + + - - -