sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some bug fixes

Browse Source
This commit is contained in:
syuilo
2018-04-08 03:58:11 +09:00
parent a1b490afa7
commit a02ee3a08b
81 changed files with 337 additions and 1318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/client/app/desktop/views/components/home.vue
View File

@ -53,7 +53,7 @@
<div class="main">
<a @click="hint">カスタマイズのヒント</a>
<div>
<mk-post-form v-if="os.i.account.clientSettings.showPostFormOnTopOfTl"/>
<mk-post-form v-if="os.i.clientSettings.showPostFormOnTopOfTl"/>
<mk-timeline ref="tl" @loaded="onTlLoaded"/>
</div>
</div>
@ -63,7 +63,7 @@
<component v-for="widget in widgets[place]" :is="`mkw-${widget.name}`" :key="widget.id" :ref="widget.id" :widget="widget" @chosen="warp"/>
</div>
<div class="main">
<mk-post-form v-if="os.i.account.clientSettings.showPostFormOnTopOfTl"/>
<mk-post-form v-if="os.i.clientSettings.showPostFormOnTopOfTl"/>
<mk-timeline ref="tl" @loaded="onTlLoaded" v-if="mode == 'timeline'"/>
<mk-mentions @loaded="onTlLoaded" v-if="mode == 'mentions'"/>
</div>
@ -82,7 +82,10 @@ export default Vue.extend({
XDraggable
},
props: {
customize: Boolean,
customize: {
type: Boolean,
default: false
},
mode: {
type: String,
default: 'timeline'
@ -104,16 +107,16 @@ export default Vue.extend({
home: {
get(): any[] {
//#region 互換性のため
(this as any).os.i.account.clientSettings.home.forEach(w => {
(this as any).os.i.clientSettings.home.forEach(w => {
if (w.name == 'rss-reader') w.name = 'rss';
if (w.name == 'user-recommendation') w.name = 'users';
if (w.name == 'recommended-polls') w.name = 'polls';
});
//#endregion
return (this as any).os.i.account.clientSettings.home;
return (this as any).os.i.clientSettings.home;
},
set(value) {
(this as any).os.i.account.clientSettings.home = value;
(this as any).os.i.clientSettings.home = value;
}
},
left(): any[] {
@ -126,7 +129,7 @@ export default Vue.extend({
created() {
this.widgets.left = this.left;
this.widgets.right = this.right;
this.$watch('os.i.account.clientSettings', i => {
this.$watch('os.i.clientSettings', i => {
this.widgets.left = this.left;
this.widgets.right = this.right;
}, {
@ -161,17 +164,17 @@ export default Vue.extend({
},
onHomeUpdated(data) {
if (data.home) {
(this as any).os.i.account.clientSettings.home = data.home;
(this as any).os.i.clientSettings.home = data.home;
this.widgets.left = data.home.filter(w => w.place == 'left');
this.widgets.right = data.home.filter(w => w.place == 'right');
} else {
const w = (this as any).os.i.account.clientSettings.home.find(w => w.id == data.id);
const w = (this as any).os.i.clientSettings.home.find(w => w.id == data.id);
if (w != null) {
w.data = data.data;
this.$refs[w.id][0].preventSave = true;
this.$refs[w.id][0].props = w.data;
this.widgets.left = (this as any).os.i.account.clientSettings.home.filter(w => w.place == 'left');
this.widgets.right = (this as any).os.i.account.clientSettings.home.filter(w => w.place == 'right');
this.widgets.left = (this as any).os.i.clientSettings.home.filter(w => w.place == 'left');
this.widgets.right = (this as any).os.i.clientSettings.home.filter(w => w.place == 'right');
}
}
},