From a5ae8f1803394531d0486fed858bff9e2d6b3aa4 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 7 May 2015 19:02:38 -0300
Subject: [PATCH] Removes ng-animate. Fix animation

---
 Gruntfile.js                        |  1 -
 bower.json                          |  1 -
 public/views/includes/topbar.html   |  6 +--
 public/views/modals/tx-details.html |  2 +-
 src/css/mobile.css                  | 72 -----------------------------
 src/js/app.js                       |  1 -
 src/js/controllers/walletHome.js    | 37 +++++++++++----
 src/js/routes.js                    |  4 +-
 src/js/services/txStatus.js         |  7 ++-
 9 files changed, 40 insertions(+), 91 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index bae584c85..ff1368ead 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -85,7 +85,6 @@ module.exports = function(grunt) {
           'bower_components/angular/angular.js',
           'bower_components/angular-ui-router/release/angular-ui-router.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/ng-lodash/build/ng-lodash.js',
           'bower_components/angular-qrcode/qrcode.js',
diff --git a/bower.json b/bower.json
index efb529612..a924bcb97 100644
--- a/bower.json
+++ b/bower.json
@@ -9,7 +9,6 @@
   "dependencies": {
     "angular": "~1.3.13",
     "angular-foundation": "*",
-    "angular-animate": "~1.3.13",
     "angular-qrcode": "~5.1.0",
     "angular-gettext": "~2.0.5",
     "animate.css": "~3.2.0",
diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html
index 28eab34a7..bf3fb769a 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">
   <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>
     </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>
       <span class="text-back">{{'Back'|translate}}</span>
     </a>
@@ -12,7 +12,7 @@
   <section class="right-small" ng-show="!goBackToState">
     <a id="camera-icon" ng-show="!closeToHome && index.isComplete" class="p10"
       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">
       <span class="text-close">{{'Close'|translate}}</span>
     </a>
diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index eb8e25b1c..44eec0752 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="left-small">
-    <a ng-click="cancel()" class="p10 ng-animate-disabled">
+    <a ng-click="cancel()" class="p10">
       <span class="text-close" translate>Close</span>
     </a>
   </section>
diff --git a/src/css/mobile.css b/src/css/mobile.css
index 6e1c5103c..d786de388 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -552,83 +552,11 @@ a.pin-button:active {
 }
 
 .reveal-modal {
-  z-index: -1;
   padding: 0;
   border: none;
   border-radius: 0;
   overflow-y: auto;
   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"],
diff --git a/src/js/app.js b/src/js/app.js
index fb2a7ba2f..cb2e8fb89 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -6,7 +6,6 @@ var modules = [
   'mm.foundation',
   'monospaced.qrcode',
   'gettext',
-  'ngAnimate',
   'ngLodash',
   'uiSwitch',
   'bwcModule',
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index bfaa27f9a..b41b11ca8 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -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) {
diff --git a/src/js/routes.js b/src/js/routes.js
index 9ef368eea..357f95f42 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -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) {
diff --git a/src/js/services/txStatus.js b/src/js/services/txStatus.js
index 697a6ab51..af5418fef 100644
--- a/src/js/services/txStatus.js
+++ b/src/js/services/txStatus.js
@@ -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;