1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-13 14:18:26 +09:00

Merge pull request #2283 from sei0o/patch-2266

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

View File

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

View File

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

View File

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

View File

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