Merge 744b23bdc0 into ff95b5e408

static/js/controllers/uicontroller.js

@@ -119,6 +119,8 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'tex
 
 		var displayName = safeDisplayName;
 
+		var roomTypeConference = "Conference";
+
 		// Init STUN from server config.
 		(function() {
 			var stun = mediaStream.config.StunURIs || [];
@@ -319,8 +321,8 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'tex
 			mediaStream.webrtc.setVideoMute(cameraMute);
 		});
 
-		$scope.$watch("microphoneMute", function(cameraMute) {
-			mediaStream.webrtc.setAudioMute(cameraMute);
+		$scope.$watch("microphoneMute", function(microphoneMute) {
+			mediaStream.webrtc.setAudioMute(microphoneMute);
 		});
 
 		$scope.$watch("peer", function(c, o) {
@@ -667,7 +669,23 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'tex
 		});
 
 		$scope.$on("room.updated", function(event, room) {
+			var oldType = $scope.roomType;
 			$scope.roomType = room ? room.Type : null;
+			if (oldType !== roomTypeConference && $scope.roomType == roomTypeConference) {
+				// Switched to conference more, start calls muted by default.
+				$scope.resetAutoMuteState = {
+					"cameraMute": $scope.cameraMute,
+					"microphoneMute": $scope.microphoneMute
+				};
+				$scope.cameraMute = true;
+				$scope.microphoneMute = true;
+			} else if (oldType === roomTypeConference && $scope.roomType !== roomTypeConference) {
+				// No longer in conference room, reset mute state to previous settings.
+				_.each($scope.resetAutoMuteState, function(v, k) {
+					$scope[k] = v;
+				});
+				$scope.resetAutoMuteState = {};
+			}
 		});
 
 		// Apply all layout stuff as classes to our element.