Merge pull request #2641 from cmgustavo/bug/imp-close-button

Improves response of close button
This commit is contained in:
Matias Alejo Garcia 2015-04-27 10:02:21 -03:00
commit 14f0c95fc7
7 changed files with 36 additions and 18 deletions

View File

@ -1,9 +1,9 @@
<nav ng-controller="topbarController as topbar" class="tab-bar animated fadeIn">
<nav ng-controller="topbarController as topbar" class="tab-bar">
<section class="left-small">
<a class="p10" ng-show="!goBackToState && !closeToHome && !index.noFocusedWallet"
<a class="p10 ng-animate-disabled" ng-show="!goBackToState && !closeToHome && !index.noFocusedWallet"
ng-click="index.openMenu()"><i class="fi-list size-24"></i>
</a>
<a ng-show="goBackToState"
<a ng-show="goBackToState" class="ng-animate-disabled"
ng-click="$root.go(goBackToState); goBackToState = null"><i class="icon-arrow-left3 icon-back"></i>
<span class="text-back">{{'Back'|translate}}</span>
</a>
@ -12,7 +12,7 @@
<section class="right-small" ng-show="!goBackToState">
<a ng-show="!closeToHome && index.isComplete" class="p10"
ng-click="topbar.openScanner()"><i class="fi-camera size-24"></i></a>
<a ng-show="closeToHome" class="p10"
<a ng-show="closeToHome" class="p10 ng-animate-disabled"
ng-click="topbar.goHome(); closeToHome = null">
<span class="text-close">{{'Close'|translate}}</span>
</a>

View File

@ -1,4 +1,4 @@
<div class="last-transactions-content"
<div class="last-transactions-content ng-animate-disabled"
ng-class="{'text-gray':!tx.pendingForUs}"
ng-click="openTxModal(tx, index.copayers)">
<div class="m5b size-12 text-gray">

View File

@ -1,6 +1,6 @@
<nav class="tab-bar">
<section class="right-small">
<a ng-click="cancel()" class="p10">
<a ng-click="cancel()" class="p10 ng-animate-disabled">
<span class="text-close" translate>Close</span>
</a>
</section>

View File

@ -1,6 +1,6 @@
<nav class="tab-bar">
<section class="right-small">
<a ng-click="cancel()" class="p10">
<a ng-click="cancel()" class="p10 ng-animate-disabled">
<span class="text-close" translate>Close</span>
</a>
</section>

View File

@ -563,11 +563,6 @@ a.pin-button:active {
padding-bottom: 20px;
}
.modal.fade,
.reveal-modal.fade {
opacity: 1;
}
.modal.fade .modal-dialog,
.modal.in .modal-dialog,
.reveal-modal-bg,
@ -575,11 +570,29 @@ a.pin-button:active {
.reveal-modal,
.reveal-modal .fade,
.reveal-modal .fade .out,
.reveal-modal .fade .in {
-webkit-transition: none !important;
transition: none !important;
.reveal-modal .fade .in,
.reveal-modal.fade.full.in,
.reveal-modal.fade.full.out,
.reveal-modal.fade.full {
/*CSS transitions*/
-o-transition-property: none !important;
-moz-transition-property: none !important;
-ms-transition-property: none !important;
-webkit-transition-property: none !important;
transition-property: none !important;
/*CSS transforms*/
-o-transform: none !important;
-moz-transform: none !important;
-ms-transform: none !important;
-webkit-transform: none !important;
transform: none !important;
/*CSS animations*/
-webkit-animation: none !important;
-moz-animation: none !important;
-o-animation: none !important;
-ms-animation: none !important;
animation: none !important;
}
.popup-tx-status {

View File

@ -83,6 +83,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
};
};
$modal.open({
animation: false,
templateUrl: 'views/modals/copayers.html',
windowClass: 'full',
controller: ModalInstanceCtrl,
@ -259,6 +260,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
};
var modalInstance = $modal.open({
animation: false,
templateUrl: 'views/modals/txp-details.html',
windowClass: 'full',
controller: ModalInstanceCtrl,
@ -769,6 +771,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
};
$modal.open({
animation: false,
templateUrl: 'views/modals/tx-details.html',
windowClass: 'full',
controller: ModalInstanceCtrl,

View File

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