Browse Source

Changed rooms service to stay in prior room when failed to join a new room because of requires account.

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

11
static/js/services/rooms.js

@ -30,6 +30,7 @@ define([
var url = restURL.api("rooms"); var url = restURL.api("rooms");
var requestedRoomName = ""; var requestedRoomName = "";
var priorRoomName = null;
var helloedRoomName = null; var helloedRoomName = null;
var currentRoom = null; var currentRoom = null;
var randomRoom = null; var randomRoom = null;
@ -58,11 +59,12 @@ define([
break; break;
case "room_join_requires_account": case "room_join_requires_account":
console.log("Room join requires a logged in user."); console.log("Room join requires a logged in user.");
alertify.dialog.notify("", translation._("Please sign in to create rooms."), function() { if (!priorRoomName || requestedRoomName === priorRoomName) {
rooms.joinDefault(); rooms.joinDefault();
}, function() { } else {
rooms.joinDefault(); rooms.joinByName(priorRoomName, true);
}); }
alertify.dialog.notify("", translation._("Please sign in to create rooms."));
break; break;
default: default:
console.log("Unknown error", error, "while joining room ", requestedRoomName); console.log("Unknown error", error, "while joining room ", requestedRoomName);
@ -98,6 +100,7 @@ define([
var priorRoom = currentRoom; var priorRoom = currentRoom;
currentRoom = room; currentRoom = room;
if (priorRoom) { if (priorRoom) {
priorRoomName = priorRoom.Name;
console.log("Left room", priorRoom.Name); console.log("Left room", priorRoom.Name);
$rootScope.$broadcast("room.left", priorRoom.Name); $rootScope.$broadcast("room.left", priorRoom.Name);
} }

Loading…
Cancel
Save