BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

now the private chat messages are displayed

Browse Source
This commit is contained in:
Anton Georgiev 2014-10-07 23:09:33 +00:00
parent 4a93388c4d
commit da846ac2d5
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
labs/meteor-client/app/client/main.coffee
View File

@ -2,7 +2,6 @@ Template.footer.helpers
getFooterString: -> getFooterString: ->
# info = Meteor.call('getServerInfo') # info = Meteor.call('getServerInfo')
dateOfBuild = getInSession 'dateOfBuild' dateOfBuild = getInSession 'dateOfBuild'
# version = "VERSION_XXXX" #info.getBuildVersion()
version = getInSession "bbbServerVersion" version = getInSession "bbbServerVersion"
copyrightYear = (new Date()).getFullYear() copyrightYear = (new Date()).getFullYear()
link = "<a href='http://bigbluebutton.org/' target='_blank'>http://bigbluebutton.org</a>" link = "<a href='http://bigbluebutton.org/' target='_blank'>http://bigbluebutton.org</a>"

4
labs/meteor-client/app/client/views/chat/chat_bar.coffee
View File

@ -79,7 +79,7 @@ Template.chatbar.helpers
'from_color': '0x3399FF' # A nice blue in hex 'from_color': '0x3399FF' # A nice blue in hex
] ]
else else
me = getInSession("userId") me = getInSession("DBID")
after = Meteor.Chat.find({ # find all messages between current user and recipient after = Meteor.Chat.find({ # find all messages between current user and recipient
'message.chat_type': 'PRIVATE_CHAT', 'message.chat_type': 'PRIVATE_CHAT',
$or: [{'message.from_userid': me, 'message.to_userid': friend},{'message.from_userid': friend, 'message.to_userid': me}] $or: [{'message.from_userid': me, 'message.to_userid': friend},{'message.from_userid': friend, 'message.to_userid': me}]
@ -105,7 +105,7 @@ Template.chatbar.helpers
if msgs[i].message.from_userid is msgs[j].message.from_userid # Both messages are from the same user if msgs[i].message.from_userid is msgs[j].message.from_userid # Both messages are from the same user
msgs[i].message.message += "\\n#{msgs[j].message.message}" # Combine the messages msgs[i].message.message += "\\n#{msgs[j].message.message}" # Combine the messages
msgs.splice(j,1) # Delete the message from the collection msgs.splice(j,1) # Delete the message from the collection
deleted=true deleted = true
else break # Messages are from different people, move on else break # Messages are from different people, move on
# #
else break # This is the break point in the chat, don't merge else break # This is the break point in the chat, don't merge