diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-04-17 19:37:32 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-04-17 19:37:32 +0900 |
| commit | 611e4f34dcb90666f2bc3da699dc965e30f7cba6 (patch) | |
| tree | 4a37539090b4c90ee4dfe5b08d8aae0682678032 /src/client/app/common | |
| parent | Merge branch 'develop' (diff) | |
| parent | 11.1.5 (diff) | |
| download | misskey-611e4f34dcb90666f2bc3da699dc965e30f7cba6.tar.gz misskey-611e4f34dcb90666f2bc3da699dc965e30f7cba6.tar.bz2 misskey-611e4f34dcb90666f2bc3da699dc965e30f7cba6.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/client/app/common')
5 files changed, 5 insertions, 10 deletions
diff --git a/src/client/app/common/scripts/note-subscriber.ts b/src/client/app/common/scripts/note-subscriber.ts index 02d810ded9..d881fe01ce 100644 --- a/src/client/app/common/scripts/note-subscriber.ts +++ b/src/client/app/common/scripts/note-subscriber.ts @@ -137,7 +137,6 @@ export default prop => ({ Vue.set(this.$_ns_target, 'deletedAt', body.deletedAt); Vue.set(this.$_ns_target, 'renote', null); this.$_ns_target.text = null; - this.$_ns_target.tags = []; this.$_ns_target.fileIds = []; this.$_ns_target.poll = null; this.$_ns_target.geo = null; diff --git a/src/client/app/common/views/components/drive-file-thumbnail.vue b/src/client/app/common/views/components/drive-file-thumbnail.vue index 1a3ef37193..d6b0092ca2 100644 --- a/src/client/app/common/views/components/drive-file-thumbnail.vue +++ b/src/client/app/common/views/components/drive-file-thumbnail.vue @@ -121,7 +121,7 @@ export default Vue.extend({ if (this.file.properties.avgColor) { anime({ targets: this.$refs.thumbnail, - backgroundColor: this.file.properties.avgColor.replace('255)', '0)'), + backgroundColor: 'transparent', // TODO fade duration: 100, easing: 'linear' }); diff --git a/src/client/app/common/views/components/post-form-attaches.vue b/src/client/app/common/views/components/post-form-attaches.vue index 1fe476be77..37422ba108 100644 --- a/src/client/app/common/views/components/post-form-attaches.vue +++ b/src/client/app/common/views/components/post-form-attaches.vue @@ -32,7 +32,7 @@ export default Vue.extend({ props: { files: { - type: Object, + type: Array, required: true }, detachMediaFn: { diff --git a/src/client/app/common/views/components/settings/settings.vue b/src/client/app/common/views/components/settings/settings.vue index 001b692551..be2d7fce85 100644 --- a/src/client/app/common/views/components/settings/settings.vue +++ b/src/client/app/common/views/components/settings/settings.vue @@ -525,15 +525,11 @@ export default Vue.extend({ this.$chooseDriveFile({ multiple: false }).then(file => { - this.$root.api('i/update', { - wallpaperId: file.id - }); + this.$store.dispatch('settings/set', { key: 'wallpaper', value: file.url }); }); }, deleteWallpaper() { - this.$root.api('i/update', { - wallpaperId: null - }); + this.$store.dispatch('settings/set', { key: 'wallpaper', value: null }); }, checkForUpdate() { this.checkingForUpdate = true; diff --git a/src/client/app/common/views/widgets/post-form.vue b/src/client/app/common/views/widgets/post-form.vue index 120de0f17b..d8617bea58 100644 --- a/src/client/app/common/views/widgets/post-form.vue +++ b/src/client/app/common/views/widgets/post-form.vue @@ -21,7 +21,7 @@ <fa :icon="['far', 'laugh']"/> </button> </div> - <x-post-form-attaches class="files" :files="files" :detachMediaFn="detachMedia"/> + <x-post-form-attaches class="files" :files="files" :detach-media-fn="detachMedia"/> <input ref="file" type="file" multiple="multiple" tabindex="-1" @change="onChangeFile"/> <mk-uploader ref="uploader" @uploaded="attachMedia"/> <footer> |