r4sas/tweb-i2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix scrolling caption

Browse Source
This commit is contained in:
Eduard Kuzmenko 2021-08-21 15:31:34 +03:00
parent 67786ef2cc
commit ebe21e0fd4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/appMediaViewer.ts
View File

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