Merge pull request #4657 from nextcloud/bugfix/noid/viewer-loading-co…

…llectives fix: Properly handle viewer loading in collectives
nextcloud · Aug 9, 2023 · 2716cfd · 2716cfd
2 parents c232edb + 549efef
commit 2716cfd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/components/ViewerComponent.vue b/src/components/ViewerComponent.vue
@@ -21,7 +21,7 @@
   -->
 
 <template>
-	<Editor v-if="isEditable"
+	<Editor v-if="!useSourceView"
 		:file-id="fileid"
 		:relative-path="filename"
 		:active="active"
@@ -96,8 +96,8 @@ export default {
 	},
 	computed: {
 		/** @return {boolean} */
-		isEditable() {
-			return this.permissions.includes('W')
+		useSourceView() {
+			return this.source && (this.fileVersion || !this.fileid)
 		},
 
 		/** @return {boolean} */
@@ -118,12 +118,12 @@ export default {
 
 	methods: {
 		async loadFileContent() {
-			if (!this.isEditable && this.source) {
+			if (this.useSourceView) {
 				const response = await axios.get(this.source)
 				this.content = response.data
 				this.contentLoaded = true
-				this.$emit('update:loaded', true)
 			}
+			this.$emit('update:loaded', true)
 		},
 	},
 }