diff options
| author | David Baker <dbkr@matrix.org> | 2014-09-18 15:51:30 +0100 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-09-18 15:51:30 +0100 |
| commit | 3bd8cbc62fd8ac47acd56ec50360259f6098c66b (patch) | |
| tree | a0db10c55eb9db72564d3cf8f91678d04ca62c81 /webclient/index.html | |
| parent | WIP video chat layout (diff) | |
| download | synapse-3bd8cbc62fd8ac47acd56ec50360259f6098c66b.tar.xz | |
Prettier and stabler video with basic support for viewing mode. For now, transition into 'large' mode is disabled.
Diffstat (limited to 'webclient/index.html')
| -rw-r--r-- | webclient/index.html | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/webclient/index.html b/webclient/index.html index 05801a93bc..78a68753d4 100644 --- a/webclient/index.html +++ b/webclient/index.html @@ -45,7 +45,12 @@ </head> <body> - <div id="videoBackground" ng-class="videoMode" ng-show="videoMode == 'large' || videoMode == 'fullscreen'"></div> + <div id="videoBackground" ng-class="videoMode"> + <div id="videoContainer" ng-class="videoMode"> + <video id="localVideo" ng-class="[videoMode, currentCall.state]" ng-show="currentCall && currentCall.type == 'video' && (currentCall.state == 'connected' || currentCall.state == 'connecting' || currentCall.state == 'invite_sent' || currentCall.state == 'ended')"></video> + <video id="remoteVideo" ng-class="[videoMode, currentCall.state]" ng-show="currentCall && currentCall.type == 'video' && (currentCall.state == 'connected' || currentCall.state == 'ended')"></video> + </div> + </div> <div id="header"> <!-- Do not show buttons on the login page --> @@ -59,8 +64,8 @@ <br /> <span id="callState"> <span ng-show="currentCall.state == 'invite_sent'">Calling...</span> - <span ng-show="currentCall.state == 'ringing' && currentCall.type == 'video'">Incoming Video Call</span> - <span ng-show="currentCall.state == 'ringing' && currentCall.type == 'voice'">Incoming Voice Call</span> + <span ng-show="currentCall.state == 'ringing' && currentCall && currentCall.type == 'video'">Incoming Video Call</span> + <span ng-show="currentCall.state == 'ringing' && currentCall && currentCall.type == 'voice'">Incoming Voice Call</span> <span ng-show="currentCall.state == 'connecting'">Call Connecting...</span> <span ng-show="currentCall.state == 'connected'">Call Connected</span> <span ng-show="currentCall.state == 'ended' && !currentCall.didConnect && currentCall.direction == 'outbound' && currentCall.hangupParty == 'remote'">Call Rejected</span> @@ -94,8 +99,6 @@ <source src="media/busy.mp3" type="audio/mpeg" /> </audio> </div> - <video id="localVideo" ng-class="videoMode" ng-show="currentCall && currentCall.type == 'video' && (currentCall.state == 'connected' || currentCall.state == 'connecting' || currentCall.state == 'invite_sent')"></video> - <video id="remoteVideo" ng-class="[videoMode, currentCall.state]" ng-show="currentCall && currentCall.type == 'video' && currentCall.state == 'connected' || currentCall.state == 'ended'"></video> <a href id="headerUserId" ng-click='goToUserPage(user_id)'>{{ user_id }}</a> |