deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Мелкие поправки

Browse Source
This commit is contained in:
Book Pauk
2019-02-15 02:56:58 +07:00
parent ca7cc322d7
commit 08f9175705
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/components/Reader/Reader.vue
View File

@@ -220,6 +220,7 @@ class Reader extends Vue {
this.allowUrlParamBookPos = settings.allowUrlParamBookPos; this.allowUrlParamBookPos = settings.allowUrlParamBookPos;
this.copyFullText = settings.copyFullText; this.copyFullText = settings.copyFullText;
this.showClickMapPage = settings.showClickMapPage; this.showClickMapPage = settings.showClickMapPage;
this.clickControl = settings.clickControl;
this.blinkCachedLoad = settings.blinkCachedLoad; this.blinkCachedLoad = settings.blinkCachedLoad;
} }
@@ -555,8 +556,8 @@ class Reader extends Vue {
return classResult; return classResult;
} }
async acivateClickMapPage() { async activateClickMapPage() {
if (this.showClickMapPage && !this.clickMapActive) { if (this.clickControl && this.showClickMapPage && !this.clickMapActive) {
this.clickMapActive = true; this.clickMapActive = true;
await this.$refs.clickMapPage.slowDisappear(); await this.$refs.clickMapPage.slowDisappear();
this.clickMapActive = false; this.clickMapActive = false;
@@ -661,7 +662,7 @@ class Reader extends Vue {
progress.hide(); this.progressActive = false; progress.hide(); this.progressActive = false;
this.blinkCachedLoadMessage(); this.blinkCachedLoadMessage();
await this.acivateClickMapPage(); await this.activateClickMapPage();
return; return;
} }
@@ -709,7 +710,7 @@ class Reader extends Vue {
} else } else
this.stopBlink = true; this.stopBlink = true;
await this.acivateClickMapPage(); await this.activateClickMapPage();
} catch (e) { } catch (e) {
progress.hide(); this.progressActive = false; progress.hide(); this.progressActive = false;
this.loaderActive = true; this.loaderActive = true;

2
client/components/Reader/SettingsPage/SettingsPage.vue
View File

@@ -252,7 +252,7 @@
<template slot="content"> <template slot="content">
Показывать или нет подсказку при каждой загрузке книги Показывать или нет подсказку при каждой загрузке книги
</template> </template>
<el-checkbox v-model="showClickMapPage">Показывать области управления кликом</el-checkbox> <el-checkbox v-model="showClickMapPage" :disabled="!clickControl">Показывать области управления кликом</el-checkbox>
</el-tooltip> </el-tooltip>
</el-form-item> </el-form-item>
<el-form-item label="Подсказка"> <el-form-item label="Подсказка">