diff options
| author | David Baker <dbkr@matrix.org> | 2014-11-13 14:37:43 +0000 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-11-13 14:37:43 +0000 |
| commit | cdb8d746efe602eb1b993a0310b4cf20c2a78995 (patch) | |
| tree | 38d8df3a56a5a415a4b24c98b7e6b2b38f24c76d /syweb/webclient/app-controller.js | |
| parent | Kill ng-animate with fire because it's terrible (was causing the page to be v... (diff) | |
| parent | Add commands-service unit tests. (diff) | |
| download | synapse-cdb8d746efe602eb1b993a0310b4cf20c2a78995.tar.xz | |
Merge with Matthew's killing of ng-animate
Conflicts: syweb/webclient/app-controller.js syweb/webclient/index.html
Diffstat (limited to 'syweb/webclient/app-controller.js')
| -rw-r--r-- | syweb/webclient/app-controller.js | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/syweb/webclient/app-controller.js b/syweb/webclient/app-controller.js index 4d89897b1d..582c075e3d 100644 --- a/syweb/webclient/app-controller.js +++ b/syweb/webclient/app-controller.js @@ -27,12 +27,6 @@ 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) { $scope.location = $location.path(); |