Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-15 00:22:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge with Matthew's killing of ng-animate

Browse source 
Conflicts:
	syweb/webclient/app-controller.js
	syweb/webclient/index.html
This commit is contained in:
David Baker 2014-11-13 14:37:43 +00:00
commit cdb8d746ef
7 changed files with 329 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

6
syweb/webclient/app-controller.js
View file

@ -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();