krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

More fixes (#9006)

Browse Source 
* Reset user when clicking profile nav

* Added editprofile

* Add scroll to conversations and scroll to bottom on messages

* Fixed profile click

* Added notification mixin

* Fixed challenge edit assignment

* Guild list item now returns summary

* Fixed tier icons

* Fixed quest invitaion check

* Fixed extra loading of party members in modals

* Removed background from avatar in tutorial

* Changed port back

* Fixed task adding
This commit is contained in:
Keith Holliday
2017-08-30 15:19:17 -06:00
committed by GitHub
parent 5c16600b25
commit 65aabc8333
16 changed files with 125 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
website/client/components/userMenu/inbox.vue
View File

@@ -23,13 +23,14 @@
h4(v-once) {{$t('emptyMessagesLine1')}}
p(v-once) {{$t('emptyMessagesLine2')}}
.conversations(v-if='filtersConversations.length > 0')
.conversation(v-for='conversation in conversations', @click='selectConversation(conversation.key)', :class="{active: selectedConversation === conversation.key}")
.conversation(v-for='conversation in conversations', @click='selectConversation(conversation.key)',
:class="{active: selectedConversation === conversation.key}")
div
span(:class="userLevelStyle(conversation)") {{conversation.name}}
span.timeago {{conversation.date | timeAgo}}
div {{conversation.lastMessageText.substring(0, 30)}}
.col-8.messages
chat-message.container-fluid.message-scroll(:chat.sync='activeChat', :inbox='true')
chat-message.container-fluid.message-scroll(:chat.sync='activeChat', :inbox='true', ref="chatscroll")
// @TODO: Implement new message header here when we fix the above
@@ -113,6 +114,11 @@
}
}
.conversations {
max-height: 400px;
overflow: scroll;
}
.conversation {
padding: 1.5em;
background: $white;
@@ -133,6 +139,7 @@
</style>
<script>
import Vue from 'vue';
import moment from 'moment';
import filter from 'lodash/filter';
// import sortBy from 'lodash/sortBy';
@@ -223,6 +230,10 @@ export default {
// return o.timestamp;
// }]);
this.$set(this, 'activeChat', activeChat);
Vue.nextTick(() => {
let chatscroll = this.$refs.chatscroll.$el;
chatscroll.scrollTop = chatscroll.scrollHeight;
});
},
sendPrivateMessage () {
this.$store.dispatch('members:sendPrivateMessage', {
@@ -241,6 +252,11 @@ export default {
this.conversations[this.selectedConversation].date = new Date();
this.newMessage = '';
Vue.nextTick(() => {
let chatscroll = this.$refs.chatscroll.$el;
chatscroll.scrollTop = chatscroll.scrollHeight;
});
},
},
};