From ebe21e0fd4602539d640bae2f8824172dd98c69d Mon Sep 17 00:00:00 2001
From: Eduard Kuzmenko <thanwords24@gmail.com>
Date: Sat, 21 Aug 2021 15:31:34 +0300
Subject: [PATCH] Fix scrolling caption

---
 src/components/appMediaViewer.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/appMediaViewer.ts b/src/components/appMediaViewer.ts
index 9e5e71ff..701f7cf0 100644
--- a/src/components/appMediaViewer.ts
+++ b/src/components/appMediaViewer.ts
@@ -338,6 +338,7 @@ class AppMediaViewerBase<ContentAdditionType extends string, ButtonsAdditionType
     this.zoomElements.container.classList.toggle('is-visible', enable);
     const zoomValue = enable ? this.zoomElements.rangeSelector.value : 1;
     this.setZoomValue(zoomValue);
+    this.zoomElements.rangeSelector.setProgress(zoomValue);
 
     if(this.videoPlayer) {
       this.videoPlayer.lockControls(enable ? false : undefined);
@@ -497,7 +498,7 @@ class AppMediaViewerBase<ContentAdditionType extends string, ButtonsAdditionType
       return;
     }
     
-    // let good = true;
+    let good = true;
     if(e.key === 'ArrowRight') {
       this.buttons.next.click();
     } else if(e.key === 'ArrowLeft') {
@@ -506,17 +507,17 @@ class AppMediaViewerBase<ContentAdditionType extends string, ButtonsAdditionType
       if(this.ctrlKeyDown) {
         this.changeZoom(e.key === '=');
       }
-    }/*  else {
+    } else {
       good = false;
-    } */
+    }
 
     if(e.ctrlKey || e.metaKey) {
       this.ctrlKeyDown = true;
     }
 
-    // if(good) {
+    if(good) {
       cancelEvent(e);
-    // }
+    }
   };
 
   private onKeyUp = (e: KeyboardEvent) => {
@@ -534,7 +535,7 @@ class AppMediaViewerBase<ContentAdditionType extends string, ButtonsAdditionType
   };
 
   private onWheel = (e: WheelEvent) => {
-    if(rootScope.overlaysActive > 1) {
+    if(rootScope.overlaysActive > 1 || (findUpClassName(e.target, 'media-viewer-caption') && !this.ctrlKeyDown)) {
       return;
     }