Merge pull request #1555 from nextcloud/backport/1554/stable25

nextcloud · Feb 24, 2023 · f74302c · f74302c
2 parents ffc45f3 + c42a283
commit f74302c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/js/viewer-main.js b/js/viewer-main.js
diff --git a/js/viewer-main.js.map b/js/viewer-main.js.map
diff --git a/src/components/ImageEditor.vue b/src/components/ImageEditor.vue
@@ -174,6 +174,7 @@ export default {
 				if (putUrl !== this.src) {
 					emit('files:file:created', { fileid: parseInt(response?.headers?.['oc-fileid']?.split('oc')[0]) || null })
 				} else {
+					this.$emit('updated')
 					emit('files:file:updated', { fileid: this.fileid })
 				}
 			} catch (error) {

diff --git a/src/components/Images.vue b/src/components/Images.vue
@@ -25,16 +25,17 @@
 		:mime="mime"
 		:src="src"
 		:fileid="fileid"
+		@updated="onUpdate"
 		@close="onClose" />
 
-	<img v-else
+	<img v-else-if="data !== null"
 		:alt="alt"
 		:class="{
 			dragging,
 			loaded,
 			zoomed: zoomRatio !== 1
 		}"
-		:src="data"
+		:src="`${data}${cacheBuster}`"
 		:style="{
 			marginTop: shiftY + 'px',
 			marginLeft: shiftX + 'px',
@@ -81,6 +82,8 @@ export default {
 			shiftY: 0,
 			zoomRatio: 1,
 			fallback: false,
+			cacheBuster: '',
+			cacheBusterCounter: 0,
 		}
 	},
 
@@ -264,6 +267,10 @@ export default {
 				this.fallback = true
 			}
 		},
+
+		onUpdate() {
+			this.cacheBuster = `?buster=${this.cacheBusterCounter++}`
+		},
 	},
 }
 </script>