Merge branch 'develop'
This commit is contained in:
commit
611e4f34dc
33 changed files with 93 additions and 92 deletions
|
|
@ -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'
|
||||
});
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ export default Vue.extend({
|
|||
|
||||
props: {
|
||||
files: {
|
||||
type: Object,
|
||||
type: Array,
|
||||
required: true
|
||||
},
|
||||
detachMediaFn: {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue