Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/viewer-init.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* extracted by css-entry-points-plugin */
@import './init-BD3WReu1.chunk.css';
@import './init-rQX3xnI4.chunk.css';
@import './previewUtils-DsspQ6dL.chunk.css';
@import './NcIconSvgWrapper-Bui9PhAS-3xIBDiQU.chunk.css';
@import './NcActionButton-BjaRp7qa.chunk.css';
Expand Down
42 changes: 21 additions & 21 deletions js/viewer-init.mjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer-init.mjs.map

Large diffs are not rendered by default.

23 changes: 18 additions & 5 deletions src/components/Images.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@
:class="{
dragging,
loaded,
zoomed: zoomRatio > 1
zoomed: zoomRatio > 1,
canZoom
}"
:src="data"
:style="imgStyle"
@error.capture.prevent.stop.once="onFail"
@load="updateImgSize"
@wheel.stop.prevent="updateZoom"
@wheel="updateZoom"
@dblclick.prevent="onDblclick"
@pointerdown.prevent="pointerDown"
@pointerup.prevent="pointerUp"
Expand All @@ -36,7 +37,8 @@
:class="{
dragging,
loaded,
zoomed: zoomRatio > 1
zoomed: zoomRatio > 1,
canZoom
}"
:style="imgStyle"
:playsinline="true"
Expand All @@ -45,7 +47,7 @@
preload="metadata"
@canplaythrough="doneLoadingLivePhoto"
@loadedmetadata="updateImgSize"
@wheel.stop.prevent="updateZoom"
@wheel="updateZoom"
@error.capture.prevent.stop.once="onFail"
@dblclick.prevent="onDblclick"
@pointerdown.prevent="pointerDown"
Expand Down Expand Up @@ -293,6 +295,8 @@ export default {
if (!this.canZoom) {
return
}
event.stopPropagation()
event.preventDefault()

const isZoomIn = event.deltaY < 0
const newZoomRatio = isZoomIn
Expand Down Expand Up @@ -324,6 +328,9 @@ export default {
* @param {DragEvent} event the event
*/
pointerDown(event) {
if (!this.canZoom) {
return
}
// New pointer - mouse down or additional touch --> store client coordinates in the pointer cache
this.pointerCache.push({ pointerId: event.pointerId, x: event.clientX, y: event.clientY })

Expand Down Expand Up @@ -469,7 +476,6 @@ img, video {
background-color: #000;
// disable animations during zooming/resize
transition: none !important;
touch-action: none;
// show checkered bg on hover if not currently zooming (but ok if zoomed)
&:hover {
background-image: linear-gradient(45deg, #{$checkered-color} 25%, transparent 25%),
Expand All @@ -492,6 +498,13 @@ img, video {
transition: none !important;
cursor: move;
}

// only claim wheel/touch gestures when zoom is actually available;
// otherwise let the browser scroll the page as normal (canZoom=false
// in embedded previews, e.g. the Smart Picker file-link widget)
&.canZoom {
touch-action: none;
}
}

.live-photo_play_button {
Expand Down
Loading