diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2020-01-17 14:22:18 +0300 |
|---|---|---|
| committer | npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com> | 2020-01-17 14:30:11 +0300 |
| commit | 356ca1c9729e7341986e3413ad8da969bb1e7cf4 (patch) | |
| tree | 914939efb43fc1a9e00c536c3d11aeb8776b64db /src | |
| parent | c06aaab0d87670633fb290d1da7d6217a03d3aee (diff) | |
Fix url escaping
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/FolderTagPreview.vue | 4 | ||||
| -rw-r--r-- | src/services/AlbumContent.js | 4 | ||||
| -rw-r--r-- | src/views/Albums.vue | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/components/FolderTagPreview.vue b/src/components/FolderTagPreview.vue index d791823a..35919538 100644 --- a/src/components/FolderTagPreview.vue +++ b/src/components/FolderTagPreview.vue @@ -127,11 +127,9 @@ export default { const path = regex.exec(this.path)[1] // apply to current route - const route = Object.assign({}, this.$route, { + return Object.assign({}, this.$route, { params: { path }, }) - // returning a string prevent vue-router to encode it again - return decodeURIComponent(this.$router.resolve(route).resolved.path) }, }, diff --git a/src/services/AlbumContent.js b/src/services/AlbumContent.js index a35fcfd1..2e7dec23 100644 --- a/src/services/AlbumContent.js +++ b/src/services/AlbumContent.js @@ -22,7 +22,7 @@ import axios from '@nextcloud/axios' import { generateUrl } from '@nextcloud/router' -import { genFileInfo } from '../utils/fileUtils' +import { genFileInfo, encodeFilePath } from '../utils/fileUtils' import allowedMimes from './AllowedMimes' /** @@ -37,7 +37,7 @@ export default async function(path = '/', options = {}) { const prefixPath = generateUrl(`/apps/photos/api/v1/${options.shared ? 'shared' : 'albums'}`) // fetch listing - const response = await axios.get(prefixPath + path, options) + const response = await axios.get(prefixPath + encodeFilePath(path), options) const list = response.data.map(data => genFileInfo(data)) // filter all the files and folders diff --git a/src/views/Albums.vue b/src/views/Albums.vue index 41456dc4..cf1360e7 100644 --- a/src/views/Albums.vue +++ b/src/views/Albums.vue @@ -180,8 +180,8 @@ export default { this.cancelRequest('Changed folder') // close any potential opened viewer & sidebar - OCA.Viewer && OCA.Viewer.close() - OCA.Files && OCA.Files.Sidebar.close() + OCA.Viewer && OCA.Viewer.close && OCA.Viewer.close() + OCA.Files && OCA.Files.Sidebar.close && OCA.Files.Sidebar.close() // if we don't already have some cached data let's show a loader if (!this.files[this.folderId]) { |