Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matthew Hodgson 2014-11-13 16:34:51 +02:00
parent 0a699df5e8
commit 11da8d0dff
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,17 +21,19 @@ limitations under the License.
'use strict'; 'use strict';
angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'eventStreamService']) angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'eventStreamService'])
.controller('MatrixWebClientController', ['$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, $animate, 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 // Check current URL to avoid to display the logout button on the login page
$scope.location = $location.path(); $scope.location = $location.path();
/*
// disable nganimate for the local and remote video elements because ngAnimate appears // 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 // to be buggy and leaves animation classes on the video elements causing them to show
// when they should not (their animations are pure CSS3) // when they should not (their animations are pure CSS3)
$animate.enabled(false, angular.element('#localVideo')); $animate.enabled(false, angular.element('#localVideo'));
$animate.enabled(false, angular.element('#remoteVideo')); $animate.enabled(false, angular.element('#remoteVideo'));
*/
// Update the location state when the ng location changed // Update the location state when the ng location changed
$rootScope.$on('$routeChangeSuccess', function (event, current, previous) { $rootScope.$on('$routeChangeSuccess', function (event, current, previous) {

1
syweb/webclient/app.js
View File

@ -16,7 +16,6 @@ limitations under the License.
var matrixWebClient = angular.module('matrixWebClient', [ var matrixWebClient = angular.module('matrixWebClient', [
'ngRoute', 'ngRoute',
'ngAnimate',
'MatrixWebClientController', 'MatrixWebClientController',
'LoginController', 'LoginController',
'RegisterController', 'RegisterController',

2
syweb/webclient/index.html
View File

@ -16,7 +16,9 @@
<script src="js/angular.js"></script> <script src="js/angular.js"></script>
<script src="js/angular-route.min.js"></script> <script src="js/angular-route.min.js"></script>
<script src="js/angular-sanitize.min.js"></script> <script src="js/angular-sanitize.min.js"></script>
<!--
<script src="js/angular-animate.min.js"></script> <script src="js/angular-animate.min.js"></script>
-->
<script src="js/jquery.peity.min.js"></script> <script src="js/jquery.peity.min.js"></script>
<script src="js/angular-peity.js"></script> <script src="js/angular-peity.js"></script>
<script type='text/javascript' src="js/ui-bootstrap-tpls-0.11.2.js"></script> <script type='text/javascript' src="js/ui-bootstrap-tpls-0.11.2.js"></script>