From 5690efb07a10d98b19355215691aa161575f06db Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 31 Jan 2020 20:21:25 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20quasar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/Reader.vue           | 17 ++------------
 .../SetPositionPage/SetPositionPage.vue       | 22 +++++++------------
 client/quasar.js                              | 11 ++++++++--
 3 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index ff14f991..6276f506 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -562,22 +562,9 @@ class Reader extends Vue {
     fullScreenToggle() {
         this.fullScreenActive = !this.fullScreenActive;
         if (this.fullScreenActive) {
-            const element = document.documentElement;
-            if (element.requestFullscreen) {
-                element.requestFullscreen();
-            } else if (element.webkitrequestFullscreen) {
-                element.webkitRequestFullscreen();
-            } else if (element.mozRequestFullscreen) {
-                element.mozRequestFullScreen();
-            }
+            this.$q.fullscreen.request();
         } else {
-            if (document.cancelFullScreen) {
-                document.cancelFullScreen();
-            } else if (document.mozCancelFullScreen) {
-                document.mozCancelFullScreen();
-            } else if (document.webkitCancelFullScreen) {
-                document.webkitCancelFullScreen();
-            }
+            this.$q.fullscreen.exit();
         }
     }
 
diff --git a/client/components/Reader/SetPositionPage/SetPositionPage.vue b/client/components/Reader/SetPositionPage/SetPositionPage.vue
index 49946fbf..ad8e6f6a 100644
--- a/client/components/Reader/SetPositionPage/SetPositionPage.vue
+++ b/client/components/Reader/SetPositionPage/SetPositionPage.vue
@@ -4,8 +4,14 @@
             Установить позицию
         </template>
 
-        <div class="slider">
-            <el-slider v-model="sliderValue" :max="sliderMax" :format-tooltip="formatTooltip"></el-slider>
+        <div class="slider q-px-md">
+            <q-slider
+                v-model="sliderValue"
+                :max="sliderMax"
+                label
+                :label-value="(sliderMax ? (sliderValue/this.sliderMax*100).toFixed(2) + '%' : 0)"
+                color="primary"
+            />
         </div>
     </Window>
 </template>
@@ -46,13 +52,6 @@ class SetPositionPage extends Vue {
         this.initialized = true;
     }
 
-    formatTooltip(val) {
-        if (this.sliderMax)
-            return (val/this.sliderMax*100).toFixed(2) + '%';
-        else
-            return 0;
-    }
-
     close() {
         this.$emit('set-position-toggle');
     }
@@ -73,9 +72,4 @@ class SetPositionPage extends Vue {
     background-color: #efefef;
     border-radius: 15px;
 }
-
-.el-slider {
-    margin-right: 20px;
-    margin-left: 20px;
-}
 </style>
\ No newline at end of file
diff --git a/client/quasar.js b/client/quasar.js
index 8af99ab4..de6a08ef 100644
--- a/client/quasar.js
+++ b/client/quasar.js
@@ -8,22 +8,29 @@ import {QCircularProgress} from 'quasar/src/components/circular-progress';
 import {QInput} from 'quasar/src/components/input';
 import {QBtn} from 'quasar/src/components/btn';
 import {QIcon} from 'quasar/src/components/icon';
+import {QSlider} from 'quasar/src/components/slider';
+
+//plugins
+import AppFullscreen from 'quasar/src/plugins/AppFullscreen';
 
 //config
 const config = {};
 
 const components = {
+    QCircularProgress,
     QInput,
     QBtn,
     QIcon,
-    QCircularProgress,
+    QSlider,
 };
 
 //directives
 const directives = {};
 
 //plugins
-const plugins = {};
+const plugins = {
+    AppFullscreen,
+};
 
 //use
 Vue.use(Quasar, { config, components, directives, plugins });