summaryrefslogtreecommitdiff
path: root/src/web/app/common/views
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-02-23 04:01:22 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-02-23 04:01:22 +0900
commit02472005967baf3da66cf09bd55251bc697d2179 (patch)
tree7fac71538d343e96757db39e224bc574f663901e /src/web/app/common/views
parent:v: (diff)
downloadmisskey-02472005967baf3da66cf09bd55251bc697d2179.tar.gz
misskey-02472005967baf3da66cf09bd55251bc697d2179.tar.bz2
misskey-02472005967baf3da66cf09bd55251bc697d2179.zip
:v:
Diffstat (limited to 'src/web/app/common/views')
-rw-r--r--src/web/app/common/views/components/messaging-room.vue13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/web/app/common/views/components/messaging-room.vue b/src/web/app/common/views/components/messaging-room.vue
index cfb1e23acf..7af6b3fae3 100644
--- a/src/web/app/common/views/components/messaging-room.vue
+++ b/src/web/app/common/views/components/messaging-room.vue
@@ -116,7 +116,9 @@ export default Vue.extend({
if (isBottom) {
// Scroll to bottom
- this.scrollToBottom();
+ this.$nextTick(() => {
+ this.scrollToBottom();
+ });
} else if (message.user_id != (this as any).os.i.id) {
// Notify
this.notify('%i18n:common.tags.mk-messaging-room.new-message%');
@@ -132,7 +134,7 @@ export default Vue.extend({
});
},
isBottom() {
- const asobi = 32;
+ const asobi = 64;
const current = this.isNaked
? window.scrollY + window.innerHeight
: this.$el.scrollTop + this.$el.offsetHeight;
@@ -179,9 +181,16 @@ export default Vue.extend({
<style lang="stylus" scoped>
.mk-messaging-room
+ display flex
+ flex 1
+ flex-direction column
+ height 100%
+
> .stream
+ width 100%
max-width 600px
margin 0 auto
+ flex 1
> .init
width 100%