fix: img defaul height/width on standalone mode

Signed-off-by: skjnldsv <[email protected]>
nextcloud · Aug 22, 2024 · 77c3fae · 77c3fae
1 parent 7f85251
commit 77c3fae
Show file tree

Hide file tree

Showing 13 changed files with 65,469 additions and 79 deletions.
diff --git a/css/main-B8JMBDQI.chunk.css b/css/main-B8JMBDQI.chunk.css
diff --git a/css/main-BQpYvOBl.chunk.css b/css/main-BQpYvOBl.chunk.css
diff --git a/css/main-Bib0W53f.chunk.css b/css/main-Bib0W53f.chunk.css
diff --git a/css/main-Bq-oOeTE.chunk.css b/css/main-Bq-oOeTE.chunk.css
diff --git a/css/main-BqxICS9X.chunk.css b/css/main-BqxICS9X.chunk.css
diff --git a/css/main-CTwq7dfv.chunk.css b/css/main-CTwq7dfv.chunk.css
diff --git a/css/main-JMTTP9er.chunk.css b/css/main-JMTTP9er.chunk.css
diff --git a/css/viewer-main.css b/css/viewer-main.css
@@ -1,6 +1,2 @@
 /* extracted by css-entry-points-plugin */
-<<<<<<< HEAD
-@import './main-dRuNgPbA.chunk.css';
-=======
-@import './main-CWJ2NyUp.chunk.css';
->>>>>>> 4f4c20d1 (chore(assets): Recompile assets)
+@import './main-BQpYvOBl.chunk.css';
diff --git a/js/viewer-main.mjs b/js/viewer-main.mjs
diff --git a/js/viewer-main.mjs.map b/js/viewer-main.mjs.map
diff --git a/src/components/Images.vue b/src/components/Images.vue
@@ -115,10 +115,6 @@ export default {
 	},
 
 	props: {
-		canZoom: {
-			type: Boolean,
-			default: false,
-		},
 		editing: {
 			type: Boolean,
 			default: false,
@@ -261,6 +257,10 @@ export default {
 		// Try to make sure that image position at stableX, stableY
 		// in client coordinates stays in the same place on the screen.
 		updateZoomAndShift(stableX, stableY, newZoomRatio) {
+			if (!this.canZoom) {
+				return
+			}
+
 			// scrolling position relative to the image
 			const element = this.$refs.image ?? this.$refs.video
 			const scrollX = stableX - element.getBoundingClientRect().x - (this.width * this.zoomRatio / 2)
@@ -364,6 +364,9 @@ export default {
 		 * @param {DragEvent} event the event
 		 */
 		 pointerMove(event) {
+			if (!this.canZoom) {
+				return
+			}
 
 			if (this.pointerCache.length > 0) {
 				// Update pointer position in the pointer cache

diff --git a/src/mixins/Mime.js b/src/mixins/Mime.js
@@ -77,6 +77,10 @@ export default {
 			type: Boolean,
 			default: true,
 		},
+		canZoom: {
+			type: Boolean,
+			default: false,
+		},
 		// is the content loaded?
 		// synced with parent
 		loaded: {
@@ -197,6 +201,9 @@ export default {
 					this.height = this.naturalHeight
 					this.width = this.naturalWidth
 				}
+			} else {
+				this.height = this.naturalHeight
+				this.width = this.naturalWidth
 			}
 		},
 

diff --git a/src/views/Viewer.vue b/src/views/Viewer.vue
@@ -32,6 +32,7 @@
 			ref="content"
 			:active="true"
 			:can-swipe="false"
+			:can-zoom="false"
 			v-bind="currentFile"
 			:file-list="[currentFile]"
 			:is-full-screen="false"
@@ -155,7 +156,7 @@
 					v-bind="currentFile"
 					:active="true"
 					:can-swipe.sync="canSwipe"
-					:can-zoom="canZoom"
+					:can-zoom="true"
 					:editing.sync="editing"
 					:file-list="fileList"
 					:is-full-screen="isFullscreen"
@@ -332,9 +333,6 @@ export default {
 		canLoop() {
 			return this.Viewer.canLoop
 		},
-		canZoom() {
-			return !this.Viewer.el
-		},
 		isStartOfList() {
 			return this.currentIndex === 0
 		},
@@ -505,7 +503,7 @@ export default {
 
 		// user reached the end of list
 		async isEndOfList(isEndOfList) {
-			if (!isEndOfList) {
+			if (!isEndOfList || this.el) {
 				return
 			}