Jelajahi Sumber

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

Book Pauk 6 tahun lalu
induk
melakukan
08f9175705

+ 5 - 4
client/components/Reader/Reader.vue

@@ -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() {
-        if (this.showClickMapPage && !this.clickMapActive) {
+    async activateClickMapPage() {
+        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;

+ 1 - 1
client/components/Reader/SettingsPage/SettingsPage.vue

@@ -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="Подсказка">