From f2465ca11fe2649c5a1c7d170baaf3778035711a Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 9 May 2020 15:55:00 +0900
Subject: [PATCH] fix(client): Fix bug that cannot set custom texture
---
src/client/pages/room/room.vue | 9 ++++-----
src/client/scripts/select-file.ts | 1 +
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/client/pages/room/room.vue b/src/client/pages/room/room.vue
index 2dd221ddf1..6ede771c56 100644
--- a/src/client/pages/room/room.vue
+++ b/src/client/pages/room/room.vue
@@ -16,7 +16,7 @@
<div v-for="k in Object.keys(selectedFurnitureInfo.props)" :key="k">
<p>{{ k }}</p>
<template v-if="selectedFurnitureInfo.props[k] === 'image'">
- <mk-button @click="chooseImage(k)">{{ $t('_rooms.chooseImage') }}</mk-button>
+ <mk-button @click="chooseImage(k, $event)">{{ $t('_rooms.chooseImage') }}</mk-button>
</template>
<template v-else-if="selectedFurnitureInfo.props[k] === 'color'">
<input type="color" :value="selectedFurnitureProps ? selectedFurnitureProps[k] : null" @change="updateColor(k, $event)"/>
@@ -69,6 +69,7 @@ import { faSave, faTrashAlt } from '@fortawesome/free-regular-svg-icons';
import { query as urlQuery } from '../../../prelude/url';
import MkButton from '../../components/ui/button.vue';
import MkSelect from '../../components/ui/select.vue';
+import { selectFile } from '../../scripts/select-file';
let room: Room;
@@ -224,10 +225,8 @@ export default Vue.extend({
});
},
- chooseImage(key) {
- this.$chooseDriveFile({
- multiple: false
- }).then(file => {
+ chooseImage(key, e) {
+ selectFile(this, e.currentTarget || e.target, null, false).then(file => {
room.updateProp(key, `/proxy/?${urlQuery({ url: file.thumbnailUrl })}`);
this.$refs.preview.selected(room.getSelectedObject());
this.changed = true;
diff --git a/src/client/scripts/select-file.ts b/src/client/scripts/select-file.ts
index 70e68e88c0..65232d3daa 100644
--- a/src/client/scripts/select-file.ts
+++ b/src/client/scripts/select-file.ts
@@ -51,6 +51,7 @@ export function selectFile(component: any, src: any, label: string | null, multi
});
};
+ // TODO
const chooseFileFromUrl = () => {
};