diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2014-11-13 16:34:51 +0200 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2014-11-13 16:34:51 +0200 |
| commit | 11da8d0dffd330bc699b83972a78c9d20e7e5071 (patch) | |
| tree | 437e7bb2959d9ec1d8510fdaa3c99dbec7c8300b /syweb | |
| parent | Wipe the selected room ID on the home screen. (diff) | |
| download | synapse-11da8d0dffd330bc699b83972a78c9d20e7e5071.tar.xz | |
remove nganimate dependency as it seems to feature disproportionately highly in the FF profiler, and removing it seems to have stopped my FF stalling for seconds on end
Diffstat (limited to 'syweb')
| -rw-r--r-- | syweb/webclient/app-controller.js | 8 | ||||
| -rw-r--r-- | syweb/webclient/app.js | 1 | ||||
| -rw-r--r-- | syweb/webclient/index.html | 2 |
3 files changed, 7 insertions, 4 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(); diff --git a/syweb/webclient/app.js b/syweb/webclient/app.js index f9d5c18ec4..9e5b85820d 100644 --- a/syweb/webclient/app.js +++ b/syweb/webclient/app.js @@ -16,7 +16,6 @@ limitations under the License. var matrixWebClient = angular.module('matrixWebClient', [ 'ngRoute', - 'ngAnimate', 'MatrixWebClientController', 'LoginController', 'RegisterController', diff --git a/syweb/webclient/index.html b/syweb/webclient/index.html index fb3c3f528c..6211ecd628 100644 --- a/syweb/webclient/index.html +++ b/syweb/webclient/index.html @@ -16,7 +16,9 @@ <script src="js/angular.js"></script> <script src="js/angular-route.min.js"></script> <script src="js/angular-sanitize.min.js"></script> +<!-- <script src="js/angular-animate.min.js"></script> +--> <script src="js/jquery.peity.min.js"></script> <script src="js/angular-peity.js"></script> <script type='text/javascript' src="js/ui-bootstrap-tpls-0.11.2.js"></script> |