Browse Source

Make sure to apply room changes.

pull/156/merge
Simon Eisenmann 11 years ago
parent
commit
74a6e604aa
  1. 16
      static/js/directives/roombar.js

16
static/js/directives/roombar.js

@ -23,7 +23,7 @@
define(['underscore', 'angular', 'text!partials/roombar.html'], function(_, angular, template) { define(['underscore', 'angular', 'text!partials/roombar.html'], function(_, angular, template) {
// roomBar // roomBar
return ["$window", "rooms", "$timeout", function($window, rooms, $timeout) { return ["$window", "rooms", "$timeout", "safeApply", function($window, rooms, $timeout, safeApply) {
var link = function($scope, $element) { var link = function($scope, $element) {
@ -51,13 +51,17 @@ define(['underscore', 'angular', 'text!partials/roombar.html'], function(_, angu
}; };
$scope.$on("room.updated", function(ev, room) { $scope.$on("room.updated", function(ev, room) {
$scope.currentRoomName = $scope.newRoomName = room.Name; safeApply($scope, function(scope) {
if ($scope.currentRoomName && !$scope.peer) { scope.currentRoomName = scope.newRoomName = room.Name;
$scope.layout.roombar = true; if (scope.currentRoomName && !scope.peer) {
} scope.layout.roombar = true;
}
});
}); });
$scope.$on("room.left", clearRoomName); $scope.$on("room.left", function() {
safeApply($scope, clearRoomName);
});
$scope.$watch("newRoomName", function(name) { $scope.$watch("newRoomName", function(name) {
if (name === $scope.currentRoomName) { if (name === $scope.currentRoomName) {

Loading…
Cancel
Save