forked from FoundKeyGang/FoundKey
✌️
This commit is contained in:
parent
80929eb176
commit
0247200596
5 changed files with 31 additions and 3 deletions
src/web/app
common/views/components
desktop/views/pages
mobile
|
@ -116,7 +116,9 @@ export default Vue.extend({
|
||||||
|
|
||||||
if (isBottom) {
|
if (isBottom) {
|
||||||
// Scroll to bottom
|
// Scroll to bottom
|
||||||
this.scrollToBottom();
|
this.$nextTick(() => {
|
||||||
|
this.scrollToBottom();
|
||||||
|
});
|
||||||
} else if (message.user_id != (this as any).os.i.id) {
|
} else if (message.user_id != (this as any).os.i.id) {
|
||||||
// Notify
|
// Notify
|
||||||
this.notify('%i18n:common.tags.mk-messaging-room.new-message%');
|
this.notify('%i18n:common.tags.mk-messaging-room.new-message%');
|
||||||
|
@ -132,7 +134,7 @@ export default Vue.extend({
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
isBottom() {
|
isBottom() {
|
||||||
const asobi = 32;
|
const asobi = 64;
|
||||||
const current = this.isNaked
|
const current = this.isNaked
|
||||||
? window.scrollY + window.innerHeight
|
? window.scrollY + window.innerHeight
|
||||||
: this.$el.scrollTop + this.$el.offsetHeight;
|
: this.$el.scrollTop + this.$el.offsetHeight;
|
||||||
|
@ -179,9 +181,16 @@ export default Vue.extend({
|
||||||
|
|
||||||
<style lang="stylus" scoped>
|
<style lang="stylus" scoped>
|
||||||
.mk-messaging-room
|
.mk-messaging-room
|
||||||
|
display flex
|
||||||
|
flex 1
|
||||||
|
flex-direction column
|
||||||
|
height 100%
|
||||||
|
|
||||||
> .stream
|
> .stream
|
||||||
|
width 100%
|
||||||
max-width 600px
|
max-width 600px
|
||||||
margin 0 auto
|
margin 0 auto
|
||||||
|
flex 1
|
||||||
|
|
||||||
> .init
|
> .init
|
||||||
width 100%
|
width 100%
|
||||||
|
|
|
@ -46,6 +46,10 @@ export default Vue.extend({
|
||||||
|
|
||||||
<style lang="stylus" scoped>
|
<style lang="stylus" scoped>
|
||||||
.mk-messaging-room-page
|
.mk-messaging-room-page
|
||||||
|
display flex
|
||||||
|
flex 1
|
||||||
|
flex-direction column
|
||||||
|
min-height 100%
|
||||||
background #fff
|
background #fff
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -5,3 +5,11 @@
|
||||||
top auto
|
top auto
|
||||||
bottom 15px
|
bottom 15px
|
||||||
left 15px
|
left 15px
|
||||||
|
|
||||||
|
html
|
||||||
|
height 100%
|
||||||
|
|
||||||
|
body
|
||||||
|
display flex
|
||||||
|
flex-direction column
|
||||||
|
min-height 100%
|
||||||
|
|
|
@ -63,5 +63,12 @@ export default Vue.extend({
|
||||||
|
|
||||||
<style lang="stylus" scoped>
|
<style lang="stylus" scoped>
|
||||||
.mk-ui
|
.mk-ui
|
||||||
|
display flex
|
||||||
|
flex 1
|
||||||
padding-top 48px
|
padding-top 48px
|
||||||
|
|
||||||
|
> .content
|
||||||
|
display flex
|
||||||
|
flex 1
|
||||||
|
flex-direction column
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<template v-if="user">%fa:R comments%{{ user.name }}</template>
|
<template v-if="user">%fa:R comments%{{ user.name }}</template>
|
||||||
<template v-else><mk-ellipsis/></template>
|
<template v-else><mk-ellipsis/></template>
|
||||||
</span>
|
</span>
|
||||||
<mk-messaging-room v-if="!fetching" :user="user" is-naked/>
|
<mk-messaging-room v-if="!fetching" :user="user" :is-naked="true"/>
|
||||||
</mk-ui>
|
</mk-ui>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue