diff options
| author | David Baker <dbkr@matrix.org> | 2014-11-13 14:34:03 +0000 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-11-13 14:34:03 +0000 |
| commit | f842bca471ec19fb0fcf8e71536b113983896140 (patch) | |
| tree | 566343999646fb997aa8fad2b05b8eb5410b943f /syweb/webclient/app-controller.js | |
| parent | This gives just enough space for the vertical scrollbar to be shown without a... (diff) | |
| download | synapse-f842bca471ec19fb0fcf8e71536b113983896140.tar.xz | |
Kill ng-animate with fire because it's terrible (was causing the page to be very sluggish). Do the call icons in pure CSS3 and use one less image to boot (in some browsers the phone icon will be the wrong browser but they can deal).
Diffstat (limited to 'syweb/webclient/app-controller.js')
| -rw-r--r-- | syweb/webclient/app-controller.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/syweb/webclient/app-controller.js b/syweb/webclient/app-controller.js index bbcf4ab5f6..4d89897b1d 100644 --- a/syweb/webclient/app-controller.js +++ b/syweb/webclient/app-controller.js @@ -21,8 +21,8 @@ limitations under the License. 'use strict'; angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'eventStreamService']) -.controller('MatrixWebClientController', ['$scope', '$location', '$rootScope', '$timeout', '$animate', 'matrixService', 'mPresence', 'eventStreamService', 'eventHandlerService', 'matrixPhoneService', 'modelService', - function($scope, $location, $rootScope, $timeout, $animate, matrixService, mPresence, eventStreamService, eventHandlerService, matrixPhoneService, modelService) { +.controller('MatrixWebClientController', ['$scope', '$location', '$rootScope', '$timeout', 'matrixService', 'mPresence', 'eventStreamService', 'eventHandlerService', 'matrixPhoneService', 'modelService', + function($scope, $location, $rootScope, $timeout, matrixService, mPresence, eventStreamService, eventHandlerService, matrixPhoneService, modelService) { // Check current URL to avoid to display the logout button on the login page $scope.location = $location.path(); @@ -30,8 +30,8 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even // 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')); + //$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) { |