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

fix for the merge and fix for an issue with get_all_meetings_request not recognized in bbb-apps

Browse Source
This commit is contained in:
Anton Georgiev 2014-07-28 21:01:06 +00:00
parent 3075166fa8
commit 7730abbeb8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,8 +79,8 @@ Template.optionsBar.events
currUserId = getInSession("userId")
duplicate = (x for x in myTabs.get() when x.userId is @userId)
if duplicate.length<=0 and @userId isnt currUserId
messageForServer = {
if duplicate.length <=0 and @userId isnt currUserId
messageForServer =
"message": "#{getUsersName()} has joined private chat with #{@user.name}."
"chat_type": "PRIVATE_CHAT"
"from_userid": getInSession("userId")

4
labs/meteor-client/server/redispubsub.coffee
View File

@ -166,7 +166,7 @@ class Meteor.RedisPubSub
"meeting_id": meetingId
"requester_id": "nodeJSapp"
"whiteboard_id": whiteboardId
"header": {
"header":
"timestamp": new Date().getTime()
"name": "get_whiteboard_shapes_request"
"version": "0.0.1"
@ -222,6 +222,6 @@ class Meteor.RedisPubSub
message =
"header":
"name": "get_all_meetings_request"
"payload": undefined #not sure if I need this
"payload": {} # I need this, otherwise bbb-apps won't recognize the message
@pubClient.publish(Meteor.config.redis.channels.toBBBApps.meeting, JSON.stringify (message))