mirror of https://github.com/BTCPrivate/copay.git
Removes ng-animate. Fix animation
This commit is contained in:
parent
931b7c25c2
commit
a5ae8f1803
|
@ -85,7 +85,6 @@ module.exports = function(grunt) {
|
||||||
'bower_components/angular/angular.js',
|
'bower_components/angular/angular.js',
|
||||||
'bower_components/angular-ui-router/release/angular-ui-router.js',
|
'bower_components/angular-ui-router/release/angular-ui-router.js',
|
||||||
'bower_components/angular-foundation/mm-foundation-tpls.js',
|
'bower_components/angular-foundation/mm-foundation-tpls.js',
|
||||||
'bower_components/angular-animate/angular-animate.js',
|
|
||||||
'bower_components/angular-moment/angular-moment.js',
|
'bower_components/angular-moment/angular-moment.js',
|
||||||
'bower_components/ng-lodash/build/ng-lodash.js',
|
'bower_components/ng-lodash/build/ng-lodash.js',
|
||||||
'bower_components/angular-qrcode/qrcode.js',
|
'bower_components/angular-qrcode/qrcode.js',
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"angular": "~1.3.13",
|
"angular": "~1.3.13",
|
||||||
"angular-foundation": "*",
|
"angular-foundation": "*",
|
||||||
"angular-animate": "~1.3.13",
|
|
||||||
"angular-qrcode": "~5.1.0",
|
"angular-qrcode": "~5.1.0",
|
||||||
"angular-gettext": "~2.0.5",
|
"angular-gettext": "~2.0.5",
|
||||||
"animate.css": "~3.2.0",
|
"animate.css": "~3.2.0",
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
<nav ng-controller="topbarController as topbar" class="tab-bar">
|
<nav ng-controller="topbarController as topbar" class="tab-bar">
|
||||||
<section class="left-small">
|
<section class="left-small">
|
||||||
<a id="hamburger" class="p10 ng-animate-disabled" ng-show="!goBackToState && !closeToHome && !index.noFocusedWallet"
|
<a id="hamburger" class="p10" ng-show="!goBackToState && !closeToHome && !index.noFocusedWallet"
|
||||||
ng-click="index.openMenu()"><i class="fi-list size-24"></i>
|
ng-click="index.openMenu()"><i class="fi-list size-24"></i>
|
||||||
</a>
|
</a>
|
||||||
<a ng-show="goBackToState" class="ng-animate-disabled"
|
<a ng-show="goBackToState"
|
||||||
ng-click="$root.go(goBackToState); goBackToState = null"><i class="icon-arrow-left3 icon-back"></i>
|
ng-click="$root.go(goBackToState); goBackToState = null"><i class="icon-arrow-left3 icon-back"></i>
|
||||||
<span class="text-back">{{'Back'|translate}}</span>
|
<span class="text-back">{{'Back'|translate}}</span>
|
||||||
</a>
|
</a>
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
<section class="right-small" ng-show="!goBackToState">
|
<section class="right-small" ng-show="!goBackToState">
|
||||||
<a id="camera-icon" ng-show="!closeToHome && index.isComplete" class="p10"
|
<a id="camera-icon" ng-show="!closeToHome && index.isComplete" class="p10"
|
||||||
ng-click="topbar.openScanner()"><i class="icon-scan size-21"></i></a>
|
ng-click="topbar.openScanner()"><i class="icon-scan size-21"></i></a>
|
||||||
<a ng-show="closeToHome" class="p10 ng-animate-disabled"
|
<a ng-show="closeToHome" class="p10"
|
||||||
ng-click="topbar.goHome(); closeToHome = null">
|
ng-click="topbar.goHome(); closeToHome = null">
|
||||||
<span class="text-close">{{'Close'|translate}}</span>
|
<span class="text-close">{{'Close'|translate}}</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<nav class="tab-bar">
|
<nav class="tab-bar">
|
||||||
<section class="left-small">
|
<section class="left-small">
|
||||||
<a ng-click="cancel()" class="p10 ng-animate-disabled">
|
<a ng-click="cancel()" class="p10">
|
||||||
<span class="text-close" translate>Close</span>
|
<span class="text-close" translate>Close</span>
|
||||||
</a>
|
</a>
|
||||||
</section>
|
</section>
|
||||||
|
|
|
@ -552,83 +552,11 @@ a.pin-button:active {
|
||||||
}
|
}
|
||||||
|
|
||||||
.reveal-modal {
|
.reveal-modal {
|
||||||
z-index: -1;
|
|
||||||
padding: 0;
|
padding: 0;
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
padding-bottom: 20px;
|
padding-bottom: 20px;
|
||||||
-webkit-animation-duration: 0.3s;
|
|
||||||
animation-duration: 0.3s;
|
|
||||||
-webkit-animation-fill-mode: both;
|
|
||||||
animation-fill-mode: both;
|
|
||||||
}
|
|
||||||
|
|
||||||
@-webkit-keyframes slideOutDown {
|
|
||||||
0% {
|
|
||||||
-webkit-transform: translate3d(0, 0, 0);
|
|
||||||
transform: translate3d(0, 0, 0);
|
|
||||||
visibility: visible;
|
|
||||||
}
|
|
||||||
|
|
||||||
100% {
|
|
||||||
-webkit-transform: translate3d(0, 100%, 0);
|
|
||||||
transform: translate3d(0, 100%, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes slideOutDown {
|
|
||||||
0% {
|
|
||||||
-webkit-transform: translate3d(0, 0, 0);
|
|
||||||
transform: translate3d(0, 0, 0);
|
|
||||||
visibility: visible;
|
|
||||||
}
|
|
||||||
|
|
||||||
100% {
|
|
||||||
-webkit-transform: translate3d(0, 100%, 0);
|
|
||||||
transform: translate3d(0, 100%, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.reveal-modal.ng-animate.in-remove.closeModalAnimation {
|
|
||||||
-webkit-animation-name: slideOutDown;
|
|
||||||
animation-name: slideOutDown;
|
|
||||||
z-index: 1003;
|
|
||||||
}
|
|
||||||
|
|
||||||
@-webkit-keyframes slideInUp {
|
|
||||||
0% {
|
|
||||||
-webkit-transform: translate3d(0, 100%, 0);
|
|
||||||
transform: translate3d(0, 100%, 0);
|
|
||||||
visibility: visible;
|
|
||||||
}
|
|
||||||
|
|
||||||
100% {
|
|
||||||
-webkit-transform: translate3d(0, 0, 0);
|
|
||||||
transform: translate3d(0, 0, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes slideInUp {
|
|
||||||
0% {
|
|
||||||
-webkit-transform: translate3d(0, 100%, 0);
|
|
||||||
transform: translate3d(0, 100%, 0);
|
|
||||||
visibility: visible;
|
|
||||||
}
|
|
||||||
|
|
||||||
100% {
|
|
||||||
-webkit-transform: translate3d(0, 0, 0);
|
|
||||||
transform: translate3d(0, 0, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.reveal-modal.ng-animate.in-add.in.in-add-active.openModalAnimation {
|
|
||||||
-webkit-animation-name: slideInUp;
|
|
||||||
animation-name: slideInUp;
|
|
||||||
}
|
|
||||||
|
|
||||||
.reveal-modal.fade.in {
|
|
||||||
z-index: 1003;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
input[type="color"],
|
input[type="color"],
|
||||||
|
|
|
@ -6,7 +6,6 @@ var modules = [
|
||||||
'mm.foundation',
|
'mm.foundation',
|
||||||
'monospaced.qrcode',
|
'monospaced.qrcode',
|
||||||
'gettext',
|
'gettext',
|
||||||
'ngAnimate',
|
|
||||||
'ngLodash',
|
'ngLodash',
|
||||||
'uiSwitch',
|
'uiSwitch',
|
||||||
'bwcModule',
|
'bwcModule',
|
||||||
|
|
|
@ -91,6 +91,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
|
|
||||||
$scope.openCopayersModal = function(copayers, copayerId) {
|
$scope.openCopayersModal = function(copayers, copayerId) {
|
||||||
var fc = profileService.focusedClient;
|
var fc = profileService.focusedClient;
|
||||||
|
|
||||||
var ModalInstanceCtrl = function($scope, $modalInstance) {
|
var ModalInstanceCtrl = function($scope, $modalInstance) {
|
||||||
$scope.copayers = copayers;
|
$scope.copayers = copayers;
|
||||||
$scope.copayerId = copayerId;
|
$scope.copayerId = copayerId;
|
||||||
|
@ -99,11 +100,16 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
$modalInstance.dismiss('cancel');
|
$modalInstance.dismiss('cancel');
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
$modal.open({
|
var modalInstance = $modal.open({
|
||||||
templateUrl: 'views/modals/copayers.html',
|
templateUrl: 'views/modals/copayers.html',
|
||||||
windowClass: 'full openModalAnimation closeModalAnimation',
|
windowClass: 'full animated slideInUp',
|
||||||
controller: ModalInstanceCtrl,
|
controller: ModalInstanceCtrl,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modalInstance.result.finally(function() {
|
||||||
|
var m = angular.element(document.getElementsByClassName('reveal-modal'));
|
||||||
|
m.addClass('slideOutDown');
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
this.openTxpModal = function(tx, copayers) {
|
this.openTxpModal = function(tx, copayers) {
|
||||||
|
@ -277,10 +283,15 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
|
|
||||||
var modalInstance = $modal.open({
|
var modalInstance = $modal.open({
|
||||||
templateUrl: 'views/modals/txp-details.html',
|
templateUrl: 'views/modals/txp-details.html',
|
||||||
windowClass: 'full openModalAnimation closeModalAnimation',
|
windowClass: 'full animated slideInUp',
|
||||||
controller: ModalInstanceCtrl,
|
controller: ModalInstanceCtrl,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modalInstance.result.finally(function() {
|
||||||
|
var m = angular.element(document.getElementsByClassName('reveal-modal'));
|
||||||
|
m.addClass('slideOutDown');
|
||||||
|
});
|
||||||
|
|
||||||
modalInstance.result.then(function(txp) {
|
modalInstance.result.then(function(txp) {
|
||||||
$scope.$emit('Local/TxProposalAction');
|
$scope.$emit('Local/TxProposalAction');
|
||||||
if (txp) {
|
if (txp) {
|
||||||
|
@ -673,11 +684,16 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
$modalInstance.dismiss('cancel');
|
$modalInstance.dismiss('cancel');
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
$modal.open({
|
var modalInstance = $modal.open({
|
||||||
templateUrl: 'views/modals/paypro.html',
|
templateUrl: 'views/modals/paypro.html',
|
||||||
windowClass: 'full openModalAnimation closeModalAnimation',
|
windowClass: 'full animated slideInUp',
|
||||||
controller: ModalInstanceCtrl,
|
controller: ModalInstanceCtrl,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modalInstance.result.finally(function() {
|
||||||
|
var m = angular.element(document.getElementsByClassName('reveal-modal'));
|
||||||
|
m.addClass('slideOutDown');
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
this.setFromPayPro = function(uri) {
|
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',
|
templateUrl: 'views/modals/tx-details.html',
|
||||||
windowClass: 'full openModalAnimation closeModalAnimation',
|
windowClass: 'full animated slideInUp',
|
||||||
controller: ModalInstanceCtrl,
|
controller: ModalInstanceCtrl,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modalInstance.result.finally(function() {
|
||||||
|
var m = angular.element(document.getElementsByClassName('reveal-modal'));
|
||||||
|
m.addClass('slideOutDown');
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
this.hasAction = function(actions, action) {
|
this.hasAction = function(actions, action) {
|
||||||
|
|
|
@ -16,11 +16,9 @@ if (window && window.navigator) {
|
||||||
//Setting up route
|
//Setting up route
|
||||||
angular
|
angular
|
||||||
.module('copayApp')
|
.module('copayApp')
|
||||||
.config(function(historicLogProvider, $provide, $logProvider, $stateProvider, $urlRouterProvider, $animateProvider) {
|
.config(function(historicLogProvider, $provide, $logProvider, $stateProvider, $urlRouterProvider) {
|
||||||
$urlRouterProvider.otherwise('/');
|
$urlRouterProvider.otherwise('/');
|
||||||
|
|
||||||
$animateProvider.classNameFilter(/^(?:(?!ng-animate-disabled).)*$/);
|
|
||||||
|
|
||||||
$logProvider.debugEnabled(true);
|
$logProvider.debugEnabled(true);
|
||||||
$provide.decorator('$log', ['$delegate',
|
$provide.decorator('$log', ['$delegate',
|
||||||
function($delegate) {
|
function($delegate) {
|
||||||
|
|
|
@ -35,11 +35,16 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash,
|
||||||
};
|
};
|
||||||
if (cb) $timeout(cb, 100);
|
if (cb) $timeout(cb, 100);
|
||||||
};
|
};
|
||||||
$modal.open({
|
var modalInstance = $modal.open({
|
||||||
templateUrl: 'views/modals/tx-status.html',
|
templateUrl: 'views/modals/tx-status.html',
|
||||||
windowClass: 'full popup-tx-status closeModalAnimation',
|
windowClass: 'full popup-tx-status closeModalAnimation',
|
||||||
controller: ModalInstanceCtrl,
|
controller: ModalInstanceCtrl,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modalInstance.result.finally(function() {
|
||||||
|
var m = angular.element(document.getElementsByClassName('reveal-modal'));
|
||||||
|
m.addClass('animated slideOutDown');
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
return root;
|
return root;
|
||||||
|
|
Loading…
Reference in New Issue