diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-12 18:19:32 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-12 18:19:32 +0100 |
| commit | e3aec9bc818e203a4883f8863acb96b9c273112a (patch) | |
| tree | 762f87365f917f510f00bc6aee7a4068cdd56e76 /webclient/index.html | |
| parent | fix embarassing bug where in-progress messages get vaped when the previous on... (diff) | |
| parent | Bump version and change log (diff) | |
| download | synapse-e3aec9bc818e203a4883f8863acb96b9c273112a.tar.xz | |
Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse
Conflicts: webclient/room/room-controller.js
Diffstat (limited to 'webclient/index.html')
| -rw-r--r-- | webclient/index.html | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/webclient/index.html b/webclient/index.html index 81c7c7d06c..9eea08215c 100644 --- a/webclient/index.html +++ b/webclient/index.html @@ -15,7 +15,9 @@ <script src="js/angular.min.js"></script> <script src="js/angular-route.min.js"></script> <script src="js/angular-sanitize.min.js"></script> + <script src="js/angular-animate.min.js"></script> <script type='text/javascript' src='js/ng-infinite-scroll-matrix.js'></script> + <script type='text/javascript' src='js/autofill-event.js'></script> <script src="app.js"></script> <script src="config.js"></script> <script src="app-controller.js"></script> @@ -56,9 +58,11 @@ <br /> <span id="callState"> <span ng-show="currentCall.state == 'invite_sent'">Calling...</span> + <span ng-show="currentCall.state == 'ringing'">Incoming 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'">Call Rejected</span> + <span ng-show="currentCall.state == 'ended' && !currentCall.didConnect && currentCall.direction == 'outbound' && currentCall.hangupParty == 'remote'">Call Rejected</span> + <span ng-show="currentCall.state == 'ended' && !currentCall.didConnect && currentCall.direction == 'outbound' && currentCall.hangupParty == 'local'">Call Canceled</span> <span ng-show="currentCall.state == 'ended' && currentCall.didConnect && currentCall.direction == 'outbound'">Call Ended</span> <span ng-show="currentCall.state == 'ended' && !currentCall.didConnect && currentCall.direction == 'inbound'">Call Canceled</span> <span ng-show="currentCall.state == 'ended' && currentCall.didConnect && currentCall.direction == 'inbound'">Call Ended</span> @@ -70,6 +74,22 @@ <button ng-click="hangupCall()">Reject</button> </span> <button ng-click="hangupCall()" ng-show="currentCall && currentCall.state != 'ringing' && currentCall.state != 'ended' && currentCall.state != 'fledgling'">Hang up</button> + <audio id="ringAudio" loop> + <source src="media/ring.ogg" type="audio/ogg" /> + <source src="media/ring.mp3" type="audio/mpeg" /> + </audio> + <audio id="ringbackAudio" loop> + <source src="media/ringback.ogg" type="audio/ogg" /> + <source src="media/ringback.mp3" type="audio/mpeg" /> + </audio> + <audio id="callendAudio"> + <source src="media/callend.ogg" type="audio/ogg" /> + <source src="media/callend.mp3" type="audio/mpeg" /> + </audio> + <audio id="busyAudio"> + <source src="media/busy.ogg" type="audio/ogg" /> + <source src="media/busy.mp3" type="audio/mpeg" /> + </audio> </div> <a href id="headerUserId" ng-click='goToUserPage(user_id)'>{{ user_id }}</a> |