Merge branch 'develop'

This commit is contained in:
syuilo 2019-04-17 19:37:32 +09:00
commit 611e4f34dc
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
33 changed files with 93 additions and 92 deletions

View file

@ -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;

View file

@ -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'
});

View file

@ -32,7 +32,7 @@ export default Vue.extend({
props: {
files: {
type: Object,
type: Array,
required: true
},
detachMediaFn: {

View file

@ -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;

View file

@ -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>