anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Removes ng-animate. Fix animation

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-05-07 19:02:38 -03:00
commit a5ae8f1803
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
9 changed files with 40 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/js/app.js
View file

@ -6,7 +6,6 @@ var modules = [
'mm.foundation',
'monospaced.qrcode',
'gettext',
'ngAnimate',
'ngLodash',
'uiSwitch',
'bwcModule',

37
src/js/controllers/walletHome.js
View file

@ -91,19 +91,25 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.openCopayersModal = function(copayers, copayerId) {
var fc = profileService.focusedClient;
var ModalInstanceCtrl = function($scope, $modalInstance) {
$scope.copayers = copayers;
$scope.copayerId = copayerId;
$scope.color = fc.backgroundColor;
$scope.cancel = function() {
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
};
};
$modal.open({
var modalInstance = $modal.open({
templateUrl: 'views/modals/copayers.html',
windowClass: 'full openModalAnimation closeModalAnimation',
windowClass: 'full animated slideInUp',
controller: ModalInstanceCtrl,
});
modalInstance.result.finally(function() {
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutDown');
});
};
this.openTxpModal = function(tx, copayers) {
@ -277,10 +283,15 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var modalInstance = $modal.open({
templateUrl: 'views/modals/txp-details.html',
windowClass: 'full openModalAnimation closeModalAnimation',
windowClass: 'full animated slideInUp',
controller: ModalInstanceCtrl,
});
modalInstance.result.finally(function() {
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutDown');
});
modalInstance.result.then(function(txp) {
$scope.$emit('Local/TxProposalAction');
if (txp) {
@ -673,11 +684,16 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$modalInstance.dismiss('cancel');
};
};
$modal.open({
var modalInstance = $modal.open({
templateUrl: 'views/modals/paypro.html',
windowClass: 'full openModalAnimation closeModalAnimation',
windowClass: 'full animated slideInUp',
controller: ModalInstanceCtrl,
});
modalInstance.result.finally(function() {
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutDown');
});
};
this.setFromPayPro = function(uri) {
@ -827,11 +843,16 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
};
};
$modal.open({
var modalInstance = $modal.open({
templateUrl: 'views/modals/tx-details.html',
windowClass: 'full openModalAnimation closeModalAnimation',
windowClass: 'full animated slideInUp',
controller: ModalInstanceCtrl,
});
modalInstance.result.finally(function() {
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutDown');
});
};
this.hasAction = function(actions, action) {

4
src/js/routes.js
View file

@ -16,11 +16,9 @@ if (window && window.navigator) {
//Setting up route
angular
.module('copayApp')
.config(function(historicLogProvider, $provide, $logProvider, $stateProvider, $urlRouterProvider, $animateProvider) {
.config(function(historicLogProvider, $provide, $logProvider, $stateProvider, $urlRouterProvider) {
$urlRouterProvider.otherwise('/');
$animateProvider.classNameFilter(/^(?:(?!ng-animate-disabled).)*$/);
$logProvider.debugEnabled(true);
$provide.decorator('$log', ['$delegate',
function($delegate) {

7
src/js/services/txStatus.js
View file

@ -35,11 +35,16 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash,
};
if (cb) $timeout(cb, 100);
};
$modal.open({
var modalInstance = $modal.open({
templateUrl: 'views/modals/tx-status.html',
windowClass: 'full popup-tx-status closeModalAnimation',
controller: ModalInstanceCtrl,
});
modalInstance.result.finally(function() {
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('animated slideOutDown');
});
};
return root;