From f26a3b31accfad27aaa995d9f07cc97fb3a6f3a6 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Mon, 27 May 2019 16:25:51 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=86=D1=83=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0?= =?UTF-8?q?=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=8C=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BA=D0=BD=D0=B8=D0=B3=D0=B8=20=D0=B8=D0=B7=20=D0=B1=D1=83?= =?UTF-8?q?=D1=84=D0=B5=D1=80=D0=B0=20=D0=BE=D0=B1=D0=BC=D0=B5=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reader/LoaderPage/LoaderPage.vue | 32 ++++++- .../PasteTextPage/PasteTextPage.vue | 93 +++++++++++++++++++ client/components/Reader/Reader.vue | 4 +- client/components/Reader/versionHistory.js | 1 + 4 files changed, 127 insertions(+), 3 deletions(-) create mode 100644 client/components/Reader/LoaderPage/PasteTextPage/PasteTextPage.vue diff --git a/client/components/Reader/LoaderPage/LoaderPage.vue b/client/components/Reader/LoaderPage/LoaderPage.vue index 3f2bedfb..160d792c 100644 --- a/client/components/Reader/LoaderPage/LoaderPage.vue +++ b/client/components/Reader/LoaderPage/LoaderPage.vue @@ -18,6 +18,10 @@ Загрузить файл с диска
+ + Из буфера обмена + +
Комментарии @@ -26,6 +30,8 @@ Помочь проекту {{ version }} + + @@ -33,12 +39,17 @@ //----------------------------------------------------------------------------- import Vue from 'vue'; import Component from 'vue-class-component'; +import PasteTextPage from './PasteTextPage/PasteTextPage.vue'; export default @Component({ + components: { + PasteTextPage, + }, }) class LoaderPage extends Vue { bookUrl = null; loadPercent = 0; + pasteTextActive = false; created() { this.commit = this.$store.commit; @@ -83,12 +94,27 @@ class LoaderPage extends Vue { } loadFile() { - const file = this.$refs.file.files[0]; + const file = this.$refs.file.files[0]; this.$refs.file.value = ''; if (file) this.$emit('load-file', {file}); } + loadBufferClick() { + this.pasteTextToggle(); + } + + loadBuffer(opts) { + if (opts.buffer.length) { + const file = new File([opts.buffer], 'dummyName-PasteFromClipboard'); + this.$emit('load-file', {file}); + } + } + + pasteTextToggle() { + this.pasteTextActive = !this.pasteTextActive; + } + openHelp() { this.$emit('help-toggle'); } @@ -102,6 +128,10 @@ class LoaderPage extends Vue { } keyHook(event) { + if (this.pasteTextActive) { + return this.$refs.pasteTextPage.keyHook(event); + } + //недостатки сторонних ui const input = this.$refs.input.$refs.input; if (document.activeElement === input && event.type == 'keydown' && event.code == 'Enter') { diff --git a/client/components/Reader/LoaderPage/PasteTextPage/PasteTextPage.vue b/client/components/Reader/LoaderPage/PasteTextPage/PasteTextPage.vue new file mode 100644 index 00000000..cfcb01ae --- /dev/null +++ b/client/components/Reader/LoaderPage/PasteTextPage/PasteTextPage.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index b308e021..29b1f487 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -68,7 +68,7 @@ @start-text-search="startTextSearch" @stop-text-search="stopTextSearch"> - + @@ -780,7 +780,7 @@ class Reader extends Vue { this.progressActive = true; - await this.$nextTick() + await this.$nextTick(); const progress = this.$refs.page; diff --git a/client/components/Reader/versionHistory.js b/client/components/Reader/versionHistory.js index 50ad6a6c..98bae321 100644 --- a/client/components/Reader/versionHistory.js +++ b/client/components/Reader/versionHistory.js @@ -9,6 +9,7 @@ export const versionHistory = [
  • в справку добавлена история версий проекта
  • добавлена возможность настройки отображаемых кнопок на панели управления
  • некоторые кнопки на панели управления были скрыты по-умолчанию
  • +
  • на страницу загрузки добавлена возможность загрузки книги из буфера обмена
  • исправления багов и недочетов
  • `