Merge pull request #1045 from nextcloud/fix/unified-preview-size

nextcloud · Apr 6, 2022 · 9e43f19 · 9e43f19
2 parents 1e19902 + ec05b4e
commit 9e43f19
Show file tree

Hide file tree

Showing 14 changed files with 436 additions and 17 deletions.
diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/...extcloud_moment_node_modules_moment_locale_sync_recursive_-src_patchedRequest_j-3cb869.js b/...extcloud_moment_node_modules_moment_locale_sync_recursive_-src_patchedRequest_j-3cb869.js
diff --git a/...loud_moment_node_modules_moment_locale_sync_recursive_-src_patchedRequest_j-3cb869.js.map b/...loud_moment_node_modules_moment_locale_sync_recursive_-src_patchedRequest_j-3cb869.js.map
diff --git a/js/photos-src_components_FolderTagPreview_vue.js b/js/photos-src_components_FolderTagPreview_vue.js
diff --git a/js/photos-src_components_FolderTagPreview_vue.js.map b/js/photos-src_components_FolderTagPreview_vue.js.map
diff --git a/...dConfig_js-src_utils_CancelableRequest_js-src_components_EmptyContent_vue-src_c-45f6cf.js b/...dConfig_js-src_utils_CancelableRequest_js-src_components_EmptyContent_vue-src_c-45f6cf.js
diff --git a/...fig_js-src_utils_CancelableRequest_js-src_components_EmptyContent_vue-src_c-45f6cf.js.map b/...fig_js-src_utils_CancelableRequest_js-src_components_EmptyContent_vue-src_c-45f6cf.js.map
diff --git a/js/photos-src_patchedRequest_js-src_views_Tags_vue.js b/js/photos-src_patchedRequest_js-src_views_Tags_vue.js
diff --git a/js/photos-src_patchedRequest_js-src_views_Tags_vue.js.map b/js/photos-src_patchedRequest_js-src_views_Tags_vue.js.map
diff --git a/js/photos-src_views_Albums_vue.js b/js/photos-src_views_Albums_vue.js
diff --git a/js/photos-src_views_Albums_vue.js.map b/js/photos-src_views_Albums_vue.js.map
diff --git a/src/components/File.vue b/src/components/File.vue
@@ -93,8 +93,11 @@ export default {
 		isImage() {
 			return this.item.injected.mime.startsWith('image')
 		},
+		decodedEtag() {
+			return this.item.injected.etag.replace('&quot;', '').replace('&quot;', '')
+		},
 		src() {
-			return generateUrl(`/core/preview?fileId=${this.item.injected.fileid}&x=${256}&y=${256}&a=${!this.croppedLayout}&v=${this.item.injected.etag}`)
+			return generateUrl(`/core/preview?fileId=${this.item.injected.fileid}&c=${this.decodedEtag}&x=${250}&y=${250}&forceIcon=0&a=${this.croppedLayout ? '0' : '1'}`)
 		},
 	},
 

diff --git a/src/components/FolderTagPreview.vue b/src/components/FolderTagPreview.vue
@@ -137,7 +137,7 @@ export default {
 	methods: {
 		generateImgSrc({ fileid, etag }) {
 			// use etag to force cache reload if file changed
-			return generateUrl(`/core/preview?fileId=${fileid}&x=${256}&y=${256}&a=true&v=${etag}`)
+			return generateUrl(`/core/preview?fileId=${fileid}&c=${etag}&x=${250}&y=${250}&forceIcon=0&a=0`)
 		},
 		onPreviewFail({ fileid }) {
 			this.failed.push(fileid)