From 6bdc13a394b6568da8be807b563b7964c756d62b Mon Sep 17 00:00:00 2001 From: Robbert Gurdeep Singh Date: Fri, 21 May 2021 21:11:09 +0200 Subject: [PATCH] Remove encodeURI code The errors that required encodeURIComponent in the past have been mittigated by the following commit on nextcloud viewer. https://github.com/nextcloud/viewer/pull/868/commits/02e1b1a993fb24f577f16ac22f816b89c578acf2 The code with hasScheme may be removed, viewer now returns a full properly encoded URI thanks to the work done in nextcloud-router fixes #381 Signed-off-by: Robbert Gurdeep Singh --- src/views/PDFView.vue | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/src/views/PDFView.vue b/src/views/PDFView.vue index d74bcc44..ac402f7a 100644 --- a/src/views/PDFView.vue +++ b/src/views/PDFView.vue @@ -33,41 +33,9 @@ export default { computed: { iframeSrc() { return generateUrl('/apps/files_pdfviewer/?file={file}', { - file: this.encodedDavPath, + file: this.davPath, }) }, - - encodedDavPath() { - const hasScheme = this.davPath.indexOf('://') !== -1 - - if (this.davPath.indexOf(generateUrl('/s/')) === 0) { - const host = window.location.protocol + '//' + window.location.host - const url = new URL(hasScheme ? this.davPath : host + this.davPath) - const path = this.filename.replace(this.basename, '') - url.searchParams.set('path', path) - url.searchParams.set('files', this.basename) - return hasScheme ? url.toString() : url.toString().substr(host.length) - } - - const pathSections = this.davPath.split('/') - - // Ignore scheme and domain in the loop (note that the scheme - // delimiter, "//", creates an empty section when split by "/"). - const initialSection = hasScheme ? 3 : 0 - - let encodedDavPath = '' - for (let i = initialSection; i < pathSections.length; i++) { - if (pathSections[i] !== '') { - encodedDavPath += '/' + encodeURIComponent(pathSections[i]) - } - } - - if (hasScheme) { - encodedDavPath = pathSections[0] + '//' + pathSections[2] + encodedDavPath - } - - return encodedDavPath - }, }, async mounted() {