This commit is contained in:
syuilo 2018-02-22 21:15:24 +09:00
parent 62d16db008
commit 4fd3192791
11 changed files with 71 additions and 47 deletions

View file

@ -1,6 +1,6 @@
<template>
<div class="mk-messaging-room-page">
<mk-messaging-room v-if="user" :user="user" is-naked/>
<mk-messaging-room v-if="user" :user="user" :is-naked="true"/>
</div>
</template>
@ -9,28 +9,37 @@ import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
export default Vue.extend({
props: ['username'],
data() {
return {
fetching: true,
user: null
};
},
watch: {
$route: 'fetch'
},
created() {
this.fetch();
},
mounted() {
Progress.start();
document.documentElement.style.background = '#fff';
},
methods: {
fetch() {
Progress.start();
this.fetching = true;
(this as any).api('users/show', {
username: this.username
}).then(user => {
this.user = user;
this.fetching = false;
(this as any).api('users/show', {
username: this.$route.params.username
}).then(user => {
this.user = user;
this.fetching = false;
document.title = 'メッセージ: ' + this.user.name;
document.title = 'メッセージ: ' + this.user.name;
Progress.done();
});
Progress.done();
});
}
}
});
</script>

View file

@ -1,15 +1,15 @@
<template>
<div class="mk-selectdrive">
<div class="mkp-selectdrive">
<mk-drive ref="browser"
:multiple="multiple"
@selected="onSelected"
@change-selection="onChangeSelection"
/>
<div>
<footer>
<button class="upload" title="%i18n:desktop.tags.mk-selectdrive-page.upload%" @click="upload">%fa:upload%</button>
<button class="cancel" @click="close">%i18n:desktop.tags.mk-selectdrive-page.cancel%</button>
<button class="ok" @click="ok">%i18n:desktop.tags.mk-selectdrive-page.ok%</button>
</div>
</footer>
</div>
</template>
@ -54,7 +54,7 @@ export default Vue.extend({
</script>
<style lang="stylus" scoped>
.mk-selectdrive
.mkp-selectdrive
display block
position fixed
width 100%
@ -64,7 +64,7 @@ export default Vue.extend({
> .mk-drive
height calc(100% - 72px)
> div
> footer
position fixed
bottom 0
left 0

View file

@ -29,12 +29,12 @@ export default Vue.extend({
user: null
};
},
created() {
this.fetch();
},
watch: {
$route: 'fetch'
},
created() {
this.fetch();
},
methods: {
fetch() {
this.fetching = true;