Browse Source

Expose prior room joins through rooms API and also use it on PIN entry aborts.

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

15
static/js/services/rooms.js

@ -50,7 +50,7 @@ define([
roompin.requestInteractively(requestedRoomName).then(joinRequestedRoom, roompin.requestInteractively(requestedRoomName).then(joinRequestedRoom,
function() { function() {
console.log("Authentication cancelled, try a different room."); console.log("Authentication cancelled, try a different room.");
rooms.joinDefault(); rooms.joinPriorOrDefault(true);
}); });
break; break;
case "authorization_not_required": case "authorization_not_required":
@ -59,12 +59,8 @@ 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.");
if (!priorRoomName || requestedRoomName === priorRoomName) {
rooms.joinDefault();
} else {
rooms.joinByName(priorRoomName, true);
}
alertify.dialog.notify("", translation._("Please sign in to create rooms.")); alertify.dialog.notify("", translation._("Please sign in to create rooms."));
rooms.joinPriorOrDefault(true);
break; break;
default: default:
console.log("Unknown error", error, "while joining room ", requestedRoomName); console.log("Unknown error", error, "while joining room ", requestedRoomName);
@ -222,6 +218,13 @@ define([
joinDefault: function(replace) { joinDefault: function(replace) {
return rooms.joinByName("", replace); return rooms.joinByName("", replace);
}, },
joinPriorOrDefault: function(replace) {
if (!priorRoomName || requestedRoomName === priorRoomName) {
rooms.joinDefault(replace);
} else {
rooms.joinByName(priorRoomName, replace);
}
},
link: function(room) { link: function(room) {
var name = room ? room.Name : null; var name = room ? room.Name : null;
if (!name) { if (!name) {

Loading…
Cancel
Save