diff options
Diffstat (limited to 'syweb/webclient/app-controller.js')
| -rw-r--r-- | syweb/webclient/app-controller.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/syweb/webclient/app-controller.js b/syweb/webclient/app-controller.js index bbcf4ab5f6..0c419a546f 100644 --- a/syweb/webclient/app-controller.js +++ b/syweb/webclient/app-controller.js @@ -21,18 +21,20 @@ 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(); +/* // 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(); |