diff --git a/bower.json b/bower.json index 2b07effab..c0bb256ef 100644 --- a/bower.json +++ b/bower.json @@ -11,7 +11,7 @@ "angular-foundation": "*", "angular-qrcode": "~5.1.0", "angular-gettext": "~2.0.5", - "animate.css": "~3.2.0", + "animate.css": "3.4.0", "foundation": "zurb/bower-foundation#~5.5.1", "foundation-icon-fonts": "*", "ng-lodash": "~0.2.0", diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 54cd7f6e0..cf0b8ca82 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -26,6 +26,16 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.isMobile = isMobile.any(); this.addr = {}; + // DISABLE ANIMATION ON CHROMEAPP + if (isChromeApp) { + var animatedSlideUp = 'full'; + var animatedSlideRight = 'full'; + } + else { + var animatedSlideUp = 'full animated slideInUp'; + var animatedSlideRight = 'full animated slideInRight'; + } + var disableScannerListener = $rootScope.$on('dataScanned', function(event, data) { self.setForm(data); $rootScope.$emit('Local/SetTab', 'send'); @@ -107,7 +117,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; var modalInstance = $modal.open({ templateUrl: 'views/modals/copayers.html', - windowClass: 'full animated slideInUp', + windowClass: animatedSlideUp, controller: ModalInstanceCtrl, }); @@ -148,7 +158,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var modalInstance = $modal.open({ templateUrl: 'views/modals/wallets.html', - windowClass: 'full animated slideInUp', + windowClass: animatedSlideUp, controller: ModalInstanceCtrl, }); @@ -352,7 +362,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var modalInstance = $modal.open({ templateUrl: 'views/modals/txp-details.html', - windowClass: 'full animated slideInRight', + windowClass: animatedSlideRight, controller: ModalInstanceCtrl, }); @@ -498,7 +508,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var modalInstance = $modal.open({ templateUrl: 'views/modals/customized-amount.html', - windowClass: 'full animated slideInUp', + windowClass: animatedSlideUp, controller: ModalInstanceCtrl, }); @@ -889,7 +899,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; var modalInstance = $modal.open({ templateUrl: 'views/modals/paypro.html', - windowClass: 'full animated slideInUp', + windowClass: animatedSlideUp, controller: ModalInstanceCtrl, }); @@ -1034,7 +1044,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var modalInstance = $modal.open({ templateUrl: 'views/modals/tx-details.html', - windowClass: 'full animated slideInRight', + windowClass: animatedSlideRight, controller: ModalInstanceCtrl, });