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

cleaning up

Browse Source
This commit is contained in:
Anton Georgiev 2014-10-29 19:39:13 +00:00
parent d6db3ce1ea
commit 22ac2f7bb4
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
labs/meteor-client/app/client/whiteboard_models/whiteboard_paper.coffee
View File

@ -789,8 +789,8 @@ class Meteor.WhiteboardPaperModel
# console.log "yEnd: #{yEnd}" # console.log "yEnd: #{yEnd}"
# console.log "boardWidth: #{boardWidth}" # console.log "boardWidth: #{boardWidth}"
# console.log "boardHeight: #{boardHeight}" # console.log "boardHeight: #{boardHeight}"
console.log "imageWidth: #{imageWidth}" #console.log "imageWidth: #{imageWidth}"
console.log "imageHeight: #{imageHeight}" #console.log "imageHeight: #{imageHeight}"
currentPresentation = Meteor.Presentations.findOne({"presentation.current": true}) currentPresentation = Meteor.Presentations.findOne({"presentation.current": true})
presentationId = currentPresentation?.presentation?.id presentationId = currentPresentation?.presentation?.id

18
labs/meteor-client/app/lib/router.coffee
View File

@ -8,26 +8,20 @@
path: "/meeting_id=*" path: "/meeting_id=*"
action: () -> action: () ->
self = @ self = @
url = location.href url = location.href
console.log "\n\nurl=#{url}\n\n" console.log "\n\nurl=#{url}\n\n"
#extract the meeting_id, user_id, auth_token, etc from the uri #extract the meeting_id, user_id, auth_token, etc from the uri
if url.indexOf("meeting_id") > -1 # if the URL is /meeting_id=...&... if url.indexOf("meeting_id") > -1 # if the URL is /meeting_id=...&...
urlParts = url.split("&"); urlParts = url.split("&")
meetingId = urlParts[0]?.split("=")[1]
meetingId = urlParts[0]?.split("=")[1]; userId = urlParts[1]?.split("=")[1]
console.log "meetingId=" + meetingId authToken = urlParts[2]?.split("=")[1]
userId = urlParts[1]?.split("=")[1];
console.log "userId=" + userId
authToken = urlParts[2]?.split("=")[1];
console.log "authToken=" + authToken
if meetingId? and userId? and authToken? if meetingId? and userId? and authToken?
Meteor.call("validateAuthToken", meetingId, userId, authToken) Meteor.call("validateAuthToken", meetingId, userId, authToken)
Meteor.call('sendMeetingInfoToClient', meetingId, userId) Meteor.call('sendMeetingInfoToClient', meetingId, userId)
self.redirect('/') self.redirect('/')
else else
console.log "unable to extract from the URL some of {meetingId, userId, authToken}" console.log "unable to extract from the URL some of {meetingId, userId, authToken}"
else else
console.log "unable to extract the required information for the meeting from the URL" console.log "unable to extract the required information for the meeting from the URL"

2
labs/meteor-client/app/server/redispubsub.coffee
View File

@ -67,7 +67,7 @@ class Meteor.RedisPubSub
if message?.header? and message?.payload? if message?.header? and message?.payload?
unless message.header.name in ignoredEventTypes unless message.header.name in ignoredEventTypes
console.log "eventType=" + message.header.name #+ "\n" console.log "eventType=" + message.header.name #+ "\n"
console.log jsonMsg #console.log jsonMsg
# handle voice events # handle voice events
if message.header.name in ['user_left_voice_message', 'user_joined_voice_message', 'user_voice_talking_message', 'user_voice_muted_message'] if message.header.name in ['user_left_voice_message', 'user_joined_voice_message', 'user_voice_talking_message', 'user_voice_muted_message']