Browse Source

Merge pull request #295 from fancycode/join_status

Include user status in "Joined" event and no longer send client side status update when room was joined.
pull/296/head
Simon Eisenmann 9 years ago committed by GitHub
parent
commit
0207e83418
  1. 1
      go/channelling/session.go
  2. 4
      static/js/controllers/uicontroller.js

1
go/channelling/session.go

@ -154,6 +154,7 @@ func (s *Session) JoinRoom(roomName, roomType string, credentials *DataRoomCrede @@ -154,6 +154,7 @@ func (s *Session) JoinRoom(roomName, roomType string, credentials *DataRoomCrede
Userid: s.userid,
Ua: s.Ua,
Prio: s.Prio,
Status: s.Status,
},
})
} else {

4
static/js/controllers/uicontroller.js

@ -588,10 +588,6 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'web @@ -588,10 +588,6 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'web
}
};
$scope.$on("room.joined", function(ev) {
$scope.updateStatus(true);
});
mediaStream.connector.e.on("open error close", function(event) {
$timeout.cancel(ttlTimeout);
$scope.userid = $scope.suserid = null;

Loading…
Cancel
Save