SWREI/switched
0
0
Fork 0
Code

Merge pull request #2283 from sei0o/patch-2266

Browse Source 
fix #2266
This commit is contained in:
syuilo 2018-08-17 19:24:10 +09:00 committed by GitHub
commit 9776d8e06b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/app/common/views/components/visibility-chooser.vue
View File

@ -44,7 +44,12 @@ import Vue from 'vue';
import * as anime from 'animejs'; import * as anime from 'animejs';
export default Vue.extend({ export default Vue.extend({
props: ['source', 'compact', 'v'], data() {
return {
v: this.$store.state.device.visibility
}
},
props: ['source', 'compact'],
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
const popover = this.$refs.popover as any; const popover = this.$refs.popover as any;
@ -92,6 +97,7 @@ export default Vue.extend({
}, },
methods: { methods: {
choose(visibility) { choose(visibility) {
this.$store.commit('device/setVisibility', visibility);
this.$emit('chosen', visibility); this.$emit('chosen', visibility);
this.$destroy(); this.$destroy();
}, },

5
src/client/app/desktop/views/components/post-form.vue
View File

@ -99,7 +99,7 @@ export default Vue.extend({
useCw: false, useCw: false,
cw: null, cw: null,
geo: null, geo: null,
visibility: 'public', visibility: this.$store.state.device.visibility || 'public',
visibleUsers: [], visibleUsers: [],
autocomplete: null, autocomplete: null,
draghover: false, draghover: false,
@ -326,8 +326,7 @@ export default Vue.extend({
setVisibility() { setVisibility() {
const w = (this as any).os.new(MkVisibilityChooser, { const w = (this as any).os.new(MkVisibilityChooser, {
source: this.$refs.visibilityButton, source: this.$refs.visibilityButton
v: this.visibility
}); });
w.$once('chosen', v => { w.$once('chosen', v => {
this.visibility = v; this.visibility = v;

5
src/client/app/mobile/views/components/post-form.vue
View File

@ -94,7 +94,7 @@ export default Vue.extend({
files: [], files: [],
poll: false, poll: false,
geo: null, geo: null,
visibility: 'public', visibility: this.$store.state.device.visibility || 'public',
visibleUsers: [], visibleUsers: [],
useCw: false, useCw: false,
cw: null, cw: null,
@ -240,8 +240,7 @@ export default Vue.extend({
setVisibility() { setVisibility() {
const w = (this as any).os.new(MkVisibilityChooser, { const w = (this as any).os.new(MkVisibilityChooser, {
source: this.$refs.visibilityButton, source: this.$refs.visibilityButton,
compact: true, compact: true
v: this.visibility
}); });
w.$once('chosen', v => { w.$once('chosen', v => {
this.visibility = v; this.visibility = v;

4
src/client/app/store.ts
View File

@ -110,6 +110,10 @@ export default (os: MiOS) => new Vuex.Store({
src: x.src, src: x.src,
arg: x.arg arg: x.arg
}; };
},
setVisibility(state, visibility) {
state.visibility = visibility;
} }
} }
}, },