diff options
| author | David Baker <dbkr@matrix.org> | 2014-09-19 16:18:15 +0100 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-09-19 16:18:15 +0100 |
| commit | da8b5a53671911bd158865f7af4b04b3b0168dfa (patch) | |
| tree | 78ada3dfcabcdcae8dc0e46445c1bfed7dcb63ab /webclient/app-controller.js | |
| parent | add unprefixed filter css as well (diff) | |
| download | synapse-da8b5a53671911bd158865f7af4b04b3b0168dfa.tar.xz | |
First working version of UI chrome for video calls.
Diffstat (limited to 'webclient/app-controller.js')
| -rw-r--r-- | webclient/app-controller.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/webclient/app-controller.js b/webclient/app-controller.js index 7f48148aaa..0e823b43e7 100644 --- a/webclient/app-controller.js +++ b/webclient/app-controller.js @@ -26,6 +26,12 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even // Check current URL to avoid to display the logout button on the login page $scope.location = $location.path(); + + // disable nganimate for the local and remote video elements because ngAnimate appears + // to be buggy and leaves animation classes on the video elements causing them to show + // when they should not (their animations are pure CSS3) + $animate.enabled(false, angular.element('#localVideo')); + $animate.enabled(false, angular.element('#remoteVideo')); // Update the location state when the ng location changed $rootScope.$on('$routeChangeSuccess', function (event, current, previous) { @@ -147,8 +153,8 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even angular.element('#ringAudio')[0].pause(); } else if (newVal == 'connected') { $timeout(function() { - //if ($scope.currentCall.type == 'video') $scope.videoMode = 'large'; - }, 5000); + if ($scope.currentCall.type == 'video') $scope.videoMode = 'large'; + }, 500); } if ($rootScope.currentCall && $rootScope.currentCall.type == 'video' && $rootScope.currentCall.state != 'connected') { |