From 47ae2f8e5952a27aa78199efb6cd35117dfd8aae Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Mon, 27 Apr 2015 03:51:41 -0300
Subject: [PATCH] Improves response of close button

---
 public/views/includes/topbar.html      |  8 +++----
 public/views/includes/transaction.html |  2 +-
 public/views/modals/tx-details.html    |  2 +-
 public/views/modals/txp-details.html   |  2 +-
 src/css/mobile.css                     | 33 ++++++++++++++++++--------
 src/js/controllers/walletHome.js       |  3 +++
 src/js/routes.js                       |  4 +++-
 7 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html
index 32ca8ce47..518ac924c 100644
--- a/public/views/includes/topbar.html
+++ b/public/views/includes/topbar.html
@@ -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>
diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html
index dd1c9ff7f..b11e2ad41 100644
--- a/public/views/includes/transaction.html
+++ b/public/views/includes/transaction.html
@@ -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">
diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index 06ab973a8..eade63dc4 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -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>
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 793794728..66b39c632 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -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>
diff --git a/src/css/mobile.css b/src/css/mobile.css
index 19a057b7c..afac7e764 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -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;
-  -webkit-transform: none !important;
-  transform: 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 {
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 3f4f73dc9..1bee29b84 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -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,
diff --git a/src/js/routes.js b/src/js/routes.js
index b03013a13..7f075b2c8 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -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) {