Use preview for unsupported images (fix #1408)

Signed-off-by: Varun Patil <varunpatil@ucla.edu>
nextcloud · Oct 12, 2022 · d89a882 · d89a882
1 parent ba57ec6
commit d89a882
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 8 deletions.
diff --git a/cypress/snapshots/base/visual-regression.cy.js/image-base.png b/cypress/snapshots/base/visual-regression.cy.js/image-base.png
diff --git a/cypress/snapshots/base/visual-regression.cy.js/image2-base.png b/cypress/snapshots/base/visual-regression.cy.js/image2-base.png
diff --git a/cypress/snapshots/base/visual-regression.cy.js/non-dav-base.png b/cypress/snapshots/base/visual-regression.cy.js/non-dav-base.png
diff --git a/cypress/snapshots/base/visual-regression.cy.js/video-base.png b/cypress/snapshots/base/visual-regression.cy.js/video-base.png
diff --git a/src/components/Images.vue b/src/components/Images.vue
@@ -104,7 +104,7 @@ export default {
  return this.getBase64FromImage()
  }
 
- if (this.source) {
+ if (this.source && !this.hasPreview) {
  return this.source
  }
 

diff --git a/src/mixins/PreviewUrl.js b/src/mixins/PreviewUrl.js
@@ -34,7 +34,6 @@ export default {
  previewPath() {
  return this.getPreviewIfAny({
  fileid: this.fileid,
- source: this.source,
  filename: this.filename,
  hasPreview: this.hasPreview,
  davPath: this.davPath,
@@ -60,17 +59,12 @@ export default {
  *
  * @param {object} data destructuring object
  * @param {string} data.fileid the file id
- * @param {?string} data.source the download source
  * @param {boolean} data.hasPreview have the file an existing preview ?
  * @param {string} data.davPath the absolute dav path
  * @param {string} data.filename the file name
  * @return {string} the absolute url
  */
- getPreviewIfAny({ fileid, source, filename, hasPreview, davPath }) {
- if (source) {
- return source
- }
-
+ getPreviewIfAny({ fileid, filename, hasPreview, davPath }) {
  const searchParams = `fileId=${fileid}`
  + `&x=${Math.floor(screen.width * devicePixelRatio)}`
  + `&y=${Math.floor(screen.height * devicePixelRatio)}`