Merge branch 'release-v0.1.0' into develop
This commit is contained in:
commit
e76cd252fe
|
@ -89,6 +89,10 @@ angular.module('RoomController', ['ngSanitize', 'mFileInput'])
|
||||||
$scope.currentCall = call;
|
$scope.currentCall = call;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$scope.memberCount = function() {
|
||||||
|
return Object.keys($scope.members).length;
|
||||||
|
};
|
||||||
|
|
||||||
$scope.paginateMore = function() {
|
$scope.paginateMore = function() {
|
||||||
if ($scope.state.can_paginate) {
|
if ($scope.state.can_paginate) {
|
||||||
// console.log("Paginating more.");
|
// console.log("Paginating more.");
|
||||||
|
|
|
@ -98,14 +98,14 @@
|
||||||
<button ng-click="inviteUser(userIDToInvite)">Invite</button>
|
<button ng-click="inviteUser(userIDToInvite)">Invite</button>
|
||||||
</span>
|
</span>
|
||||||
<button ng-click="leaveRoom()">Leave</button>
|
<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'">
|
<div ng-show="currentCall.state == 'ringing'">
|
||||||
Incoming call from {{ currentCall.user_id }}
|
Incoming call from {{ currentCall.user_id }}
|
||||||
<button ng-click="answerCall()">Answer</button>
|
<button ng-click="answerCall()">Answer</button>
|
||||||
<button ng-click="hangupCall()">Reject</button>
|
<button ng-click="hangupCall()">Reject</button>
|
||||||
</div>
|
</div>
|
||||||
<button ng-click="hangupCall()" ng-show="currentCall && currentCall.state != 'ringing'">Hang up</button>
|
<button ng-click="hangupCall()" ng-show="currentCall && currentCall.state != 'ringing'">Hang up</button>
|
||||||
{{ currentCall.state }}
|
<span style="display: none; ">{{ currentCall.state }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{ feedback }}
|
{{ feedback }}
|
||||||
|
|
Loading…
Reference in New Issue