Merge branch 'meteor-merge-private-chat' of https://github.com/antobinary/bigbluebutton into prototype-metor-client

This commit is contained in:
perroned 2014-07-09 09:08:07 -07:00
commit e91f0e832e
2 changed files with 4 additions and 2 deletions

View File

@ -10,7 +10,8 @@ Router.map ->
Meteor.subscribe 'shapes', Session.get('meetingId') Meteor.subscribe 'shapes', Session.get('meetingId')
Meteor.subscribe 'slides', Session.get('meetingId') Meteor.subscribe 'slides', Session.get('meetingId')
Meteor.subscribe 'chatTabs', Session.get('userId') Meteor.subscribe 'chatTabs', Session.get('userId')
Meteor.subscribe 'meetings', Session.get('meetingId')
# I have no idea where to put this # I have no idea where to put this
Meteor.ChatTabs.insert({isActive:true, name:"Public", class: "publicChatTab", 'belongsTo': Session.get("userId")}) Meteor.ChatTabs.insert({isActive:true, name:"Public", class: "publicChatTab", 'belongsTo': Session.get("userId")})
Meteor.ChatTabs.insert({isActive:false, name:"Options", class: "optionsChatTab", 'belongsTo': Session.get("userId")}) Meteor.ChatTabs.insert({isActive:false, name:"Options", class: "optionsChatTab", 'belongsTo': Session.get("userId")})

View File

@ -15,4 +15,5 @@ Meteor.publish 'slides', (meetingId) ->
Meteor.publish 'chatTabs', (userId) -> Meteor.publish 'chatTabs', (userId) ->
Meteor.ChatTabs.find({'belongsTo': userId}) Meteor.ChatTabs.find({'belongsTo': userId})
# should we be publishing Meteor.Meetings? for now we are not Meteor.publish 'meetings', (meetingId) ->
Meteor.Meetings.find({meetingId: meetingId})