From 9ac8dc7fd1cf43b99e59d06062bb31423b25c85f Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sat, 7 Sep 2019 17:39:00 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=B8=D0=B0=D0=BB=D0=BE=D0=B3=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=BD=D0=B0=20=D1=81=D0=BC=D0=B0=D1=80=D1=82=D1=84?= =?UTF-8?q?=D0=BE=D0=BD=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/Reader.vue | 1 + .../Reader/SettingsPage/SettingsPage.vue | 23 +++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index 6ab3964f..f0685e2f 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -310,6 +310,7 @@ class Reader extends Vue { //TODO: убрать в будущем if (this.showToolButton['history']) { const newShowToolButton = Object.assign({}, this.showToolButton); + newShowToolButton['recentBooks'] = true; delete newShowToolButton['history']; const newSettings = Object.assign({}, this.settings, { showToolButton: newShowToolButton }); this.commit('reader/setSettings', newSettings); diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue index 231b7820..301345bc 100644 --- a/client/components/Reader/SettingsPage/SettingsPage.vue +++ b/client/components/Reader/SettingsPage/SettingsPage.vue @@ -694,9 +694,10 @@ class SettingsPage extends Vue { async setDefaults() { try { - if (await this.$confirm('Подтвердите установку настроек по-умолчанию:', '', { + if (await this.$confirm('Подтвердите установку настроек по умолчанию:', '', { confirmButtonText: 'OK', cancelButtonText: 'Отмена', + customClass: 'prompt-dialog', type: 'warning' })) { this.form = Object.assign({}, rstore.settingDefaults); @@ -723,6 +724,7 @@ class SettingsPage extends Vue { confirmButtonText: 'OK', cancelButtonText: 'Отмена', inputValidator: (str) => { if (!str) return 'Название не должно быть пустым'; else if (str.length > 50) return 'Слишком длинное название'; else return true; }, + customClass: 'prompt-dialog', }); if (result.value) { if (this.profiles[result.value]) { @@ -754,7 +756,8 @@ class SettingsPage extends Vue { confirmButtonText: 'OK', cancelButtonText: 'Отмена', inputValidator: (str) => { if (str && str.toLowerCase() === 'да') return true; else return 'Удаление не подтверждено'; }, - type: 'warning' + customClass: 'prompt-dialog', + type: 'warning', }); if (result.value && result.value.toLowerCase() == 'да') { @@ -785,7 +788,8 @@ class SettingsPage extends Vue { confirmButtonText: 'OK', cancelButtonText: 'Отмена', inputValidator: (str) => { if (str && str.toLowerCase() === 'да') return true; else return 'Удаление не подтверждено'; }, - type: 'warning' + customClass: 'prompt-dialog', + type: 'warning', }); if (result.value && result.value.toLowerCase() == 'да') { @@ -824,7 +828,8 @@ class SettingsPage extends Vue { cancelButtonText: 'Отмена', inputValidator: (str) => { if (str && utils.fromBase58(str).length == 32) return true; else return 'Неверный формат ключа'; }, inputValue: (key && _.isString(key) ? key : null), - type: 'warning' + customClass: 'prompt-dialog', + type: 'warning', }); if (result.value && utils.fromBase58(result.value).length == 32) { @@ -843,7 +848,8 @@ class SettingsPage extends Vue { confirmButtonText: 'OK', cancelButtonText: 'Отмена', inputValidator: (str) => { if (str && str.toLowerCase() === 'да') return true; else return 'Генерация не подтверждена'; }, - type: 'warning' + customClass: 'prompt-dialog', + type: 'warning', }); if (result.value && result.value.toLowerCase() == 'да') { @@ -910,4 +916,11 @@ class SettingsPage extends Vue { .center { text-align: center; } + + + \ No newline at end of file