user_left_event is now handled by the client. The username is moved to the...

user_left_event is now handled by the client. The username is moved to the left-hand side (was supposed to remove it)

client/bbb-html5-client/public/js/collections/users.coffee

@@ -48,6 +48,11 @@ define [
         @remove(toDel)
         globals.events.trigger("users:user_leave", userid)
 
+      globals.events.on "connection:user_left", (userid) =>
+        toDel = @get(userid)
+        @remove(toDel)
+        globals.events.trigger("users:user_left", userid)
+
       globals.events.on "connection:setPresenter", (userid) =>
         globals.events.trigger("users:setPresenter", userid)
 

client/bbb-html5-client/public/js/models/connection.coffee

@@ -205,8 +205,13 @@ define [
         console.log "message: " + message
         userid = message.payload.user.id
         username = message.payload.user.name
+        globals.events.trigger("connection:user_join", userid, username) #should it be user_joined?! #TODO
 
-        globals.events.trigger("connection:user_join", userid, username)
+      # Received event when a user leaves
+      @socket.on "user_left_event", (message) =>
+        console.log "message: " + message
+        userid = message.payload.user.id
+        globals.events.trigger("connection:user_left", userid)
 
       # Received event when a user leave
       @socket.on "user leave", (userid) =>
@@ -219,14 +224,6 @@ define [
         console.log "socket on: setPresenter"
         globals.events.trigger("connection:setPresenter", userid)
 
-      # Received event for a new public chat message
-      # @param  {string} name name of user
-      # @param  {string} msg  message to be displayed
-      #THIS IS THE OLD MESSAGE FORMAT. NOT USED ANYMORE
-      ###@socket.on "msg", (name, msg) =>
-        console.log "socket on: msg"
-        globals.events.trigger("connection:msg", name, msg)###
-
       # Received event for a new public chat message
       # @param  {string} name name of user
       # @param  {string} msg  message to be displayed

client/bbb-html5-client/public/js/views/session_chat.coffee

@@ -64,6 +64,9 @@ define [
       globals.events.on "users:user_leave", (userid) =>
         @_removeUserFromChatList(userid, username)
 
+      globals.events.on "users:user_left", (userid) =>
+        @_removeUserFromChatList(userid) #do we need username or userid is sufficient?
+
       globals.events.on "users:user_join", (userid, username) =>
         @_addUserToChatList(userid, username)
 

client/bbb-html5-client/public/js/views/session_users.coffee

@@ -53,6 +53,9 @@ define [
       globals.events.on "users:user_leave", (userid) =>
         @_removeUserByID(userid)
 
+      globals.events.on "users:user_left", (userid) =>
+        @_removeUserByID(userid)
+
       globals.events.on "users:setPresenter", (userid) =>
         @_setPresenter(userid)
 
@@ -60,7 +63,7 @@ define [
     _removeAllUsers: ->
       @$(@userListID).empty()
 
-    # Removes all users from the screen.
+    # Removes all a user from the list #TODO - for now it does not remove but moves to the left hand side
     _removeUserByID: (userID)->
       @$("#user-"+userID).remove()