diff options
| author | David Baker <dbkr@matrix.org> | 2014-08-29 14:01:30 +0100 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-08-29 14:01:30 +0100 |
| commit | e76cd252feeb7a4ab493ef595db29356ff34b98d (patch) | |
| tree | 7a75b8a231ffbaaa331d34085074b00c5dd3acb2 | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Only show voice call button if there are exactly 2 members in the room. Also ... (diff) | |
| download | synapse-e76cd252feeb7a4ab493ef595db29356ff34b98d.tar.xz | |
Merge branch 'release-v0.1.0' into develop
| -rw-r--r-- | webclient/room/room-controller.js | 6 | ||||
| -rw-r--r-- | webclient/room/room.html | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index 6232ce8ed3..09dac85d26 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -51,7 +51,7 @@ angular.module('RoomController', ['ngSanitize', 'mFileInput']) objDiv.scrollTop = objDiv.scrollHeight; }, 0); }; - + $scope.$on(eventHandlerService.MSG_EVENT, function(ngEvent, event, isLive) { if (isLive && event.room_id === $scope.room_id) { scrollToBottom(); @@ -88,6 +88,10 @@ angular.module('RoomController', ['ngSanitize', 'mFileInput']) call.onHangup = $scope.onCallHangup; $scope.currentCall = call; }); + + $scope.memberCount = function() { + return Object.keys($scope.members).length; + }; $scope.paginateMore = function() { if ($scope.state.can_paginate) { diff --git a/webclient/room/room.html b/webclient/room/room.html index 572c52e64e..a3514c3a91 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -98,14 +98,14 @@ <button ng-click="inviteUser(userIDToInvite)">Invite</button> </span> <button ng-click="leaveRoom()">Leave</button> - <button ng-click="startVoiceCall()" ng-show="currentCall == undefined">Voice Call</button> + <button ng-click="startVoiceCall()" ng-show="currentCall == undefined && memberCount() == 2">Voice Call</button> <div ng-show="currentCall.state == 'ringing'"> Incoming call from {{ currentCall.user_id }} <button ng-click="answerCall()">Answer</button> <button ng-click="hangupCall()">Reject</button> </div> <button ng-click="hangupCall()" ng-show="currentCall && currentCall.state != 'ringing'">Hang up</button> - {{ currentCall.state }} + <span style="display: none; ">{{ currentCall.state }}</span> </div> {{ feedback }} |