diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-04-17 14:30:31 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-04-17 14:30:31 +0900 |
| commit | 85959a3b9bef93e9b26e6b58c49145d6f67ea571 (patch) | |
| tree | 783e7bde3e66444913884e97fcf8c0d81599974d /src/client | |
| parent | Clean up (diff) | |
| download | misskey-85959a3b9bef93e9b26e6b58c49145d6f67ea571.tar.gz misskey-85959a3b9bef93e9b26e6b58c49145d6f67ea571.tar.bz2 misskey-85959a3b9bef93e9b26e6b58c49145d6f67ea571.zip | |
Fix #4721 Fix #4722
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/common/views/components/settings/settings.vue | 8 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/ui.vue | 7 | ||||
| -rw-r--r-- | src/client/app/store.ts | 1 |
3 files changed, 6 insertions, 10 deletions
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/desktop/views/components/ui.vue b/src/client/app/desktop/views/components/ui.vue index fa5efbc93e..d29fbdc1a5 100644 --- a/src/client/app/desktop/views/components/ui.vue +++ b/src/client/app/desktop/views/components/ui.vue @@ -1,6 +1,6 @@ <template> <div class="mk-ui" v-hotkey.global="keymap"> - <div class="bg" v-if="$store.getters.isSignedIn && $store.state.i.wallpaperUrl" :style="style"></div> + <div class="bg" v-if="$store.getters.isSignedIn && $store.state.settings.wallpaper" :style="style"></div> <x-header class="header" v-if="navbar == 'top'" v-show="!zenMode" ref="header"/> <x-sidebar class="sidebar" v-if="navbar != 'top'" v-show="!zenMode" ref="sidebar"/> <div class="content" :class="[{ sidebar: navbar != 'top', zen: zenMode }, navbar]"> @@ -33,10 +33,9 @@ export default Vue.extend({ }, style(): any { - if (!this.$store.getters.isSignedIn || this.$store.state.i.wallpaperUrl == null) return {}; + if (!this.$store.getters.isSignedIn || this.$store.state.settings.wallpaper == null) return {}; return { - backgroundColor: this.$store.state.i.wallpaperColor && this.$store.state.i.wallpaperColor.length == 3 ? `rgb(${ this.$store.state.i.wallpaperColor.join(',') })` : null, - backgroundImage: `url(${ this.$store.state.i.wallpaperUrl })` + backgroundImage: `url(${ this.$store.state.settings.wallpaper })` }; }, diff --git a/src/client/app/store.ts b/src/client/app/store.ts index c82981ad24..44b893835c 100644 --- a/src/client/app/store.ts +++ b/src/client/app/store.ts @@ -28,6 +28,7 @@ const defaultSettings = { iLikeSushi: false, rememberNoteVisibility: false, defaultNoteVisibility: 'public', + wallpaper: null, webSearchEngine: 'https://www.google.com/?#q={{query}}', mutedWords: [], games: { |