From 33d8082601ae27ea75f1e06ea8f35b9425d16e2f Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Sat, 1 Jul 2017 09:10:31 +0100 Subject: [PATCH] Fix UTF8 characters encoding on file rename and display #99 Former-commit-id: e97af869293632e19a6af1c5834f6d00609a2405 [formerly 912200dce77db373ccce68ed4bf1bf16ca4e66e8] [formerly 4e222647913369d96d518e4078018e12c8dee8f9 [formerly 1871981fea42df162c08512d54838b21f1e579de]] Former-commit-id: 8442a168025179ea117265bc56cd79d85a43a6d5 [formerly c07adbeb5c51b5ded79e9829a6e9eedef57cadd1] Former-commit-id: 692840e184784622a971f5f52007691da52137bb --- _assets/src/components/Listing.vue | 2 +- _assets/src/components/ListingItem.vue | 6 +----- _assets/src/components/RenamePrompt.vue | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/_assets/src/components/Listing.vue b/_assets/src/components/Listing.vue index 8b7e3059..8b08a6cb 100644 --- a/_assets/src/components/Listing.vue +++ b/_assets/src/components/Listing.vue @@ -85,7 +85,7 @@ export default { }, methods: { base64: function (name) { - return window.btoa(name) + return window.btoa(unescape(encodeURIComponent(name))) }, dragEnter: function (event) { let items = document.getElementsByClassName('item') diff --git a/_assets/src/components/ListingItem.vue b/_assets/src/components/ListingItem.vue index 64ded53d..d8efc13a 100644 --- a/_assets/src/components/ListingItem.vue +++ b/_assets/src/components/ListingItem.vue @@ -6,8 +6,7 @@ @drop="drop" @click="click" @dblclick="open" - :aria-selected="isSelected()" - :id="base64()"> + :aria-selected="isSelected()">
{{ icon() }}
@@ -57,9 +56,6 @@ export default { humanTime: function () { return moment(this.modified).fromNow() }, - base64: function () { - return window.btoa(this.name) - }, dragStart: function (event) { if (this.selectedCount === 0) { this.addSelected(this.index) diff --git a/_assets/src/components/RenamePrompt.vue b/_assets/src/components/RenamePrompt.vue index b46c1e16..6999d669 100644 --- a/_assets/src/components/RenamePrompt.vue +++ b/_assets/src/components/RenamePrompt.vue @@ -49,6 +49,7 @@ export default { oldLink = this.req.data.items[this.selected[0]].url } + this.name = encodeURIComponent(this.name) newLink = page.removeLastDir(oldLink) + '/' + this.name // buttons.setLoading('rename')