Browse Source

Avoid dead ends in room join code and avoid to join a room when connector is not connected.

pull/156/merge
Simon Eisenmann 11 years ago
parent
commit
b1b55cb47e
  1. 16
      static/js/services/rooms.js

16
static/js/services/rooms.js

@ -69,20 +69,24 @@ define([
}; };
var joinRequestedRoom = function() { var joinRequestedRoom = function() {
if (appData.authorizing()) { if (!connector.connected || appData.authorizing()) {
// Do nothing while authorizing. // Do nothing while not connected or authorizing.
return; return;
} }
if (!connector.connected || !currentRoom || requestedRoomName !== currentRoom.Name) { if (!currentRoom || requestedRoomName !== currentRoom.Name) {
requestedRoomName = requestedRoomName ? requestedRoomName : ""; requestedRoomName = requestedRoomName ? requestedRoomName : "";
if (helloedRoomName !== requestedRoomName) { if (helloedRoomName !== requestedRoomName) {
console.log("Joining room", [requestedRoomName]);
helloedRoomName = requestedRoomName; helloedRoomName = requestedRoomName;
var myHelloedRoomName = helloedRoomName;
_.defer(function() {
if (helloedRoomName === myHelloedRoomName) {
helloedRoomName = null;
}
});
console.log("Joining room", [requestedRoomName]);
api.sendHello(requestedRoomName, roompin.get(requestedRoomName), function(room) { api.sendHello(requestedRoomName, roompin.get(requestedRoomName), function(room) {
helloedRoomName = null;
setCurrentRoom(room); setCurrentRoom(room);
}, function(error) { }, function(error) {
helloedRoomName = null;
joinFailed(error); joinFailed(error);
}); });
} }

Loading…
Cancel
Save