From 41287829792027ceb95b748fdb0a9cb74a8ea2ec Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 11 May 2015 15:21:08 -0300
Subject: [PATCH] add timeout to walletHome

---
 src/js/controllers/walletHome.js | 16 ++++++++--------
 src/js/routes.js                 |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 895eccb32..4ec12ece0 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -91,12 +91,12 @@ 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');
       };
     };
@@ -315,8 +315,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
           $timeout(function() {
             self.setNewAddress();
           }, 5000);
-        }
-        else {
+        } else {
           $log.debug('Creating address ERROR:', err);
           $scope.$emit('Local/ClientError', err);
           $scope.$digest();
@@ -861,8 +860,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   };
 
   // Startup events
-  this.bindTouchDown();
-  this.setAddress();
-  this.setSendFormInputs();
-
+  $timeout(function() {
+    self.bindTouchDown();
+    self.setAddress();
+    self.setSendFormInputs();
+  }, 50);
 });
diff --git a/src/js/routes.js b/src/js/routes.js
index d97ec6c74..1f681c824 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -421,7 +421,6 @@ angular
         var cleanedUp = false, timeoutID;
         var cleanUp = function() {
           if (cleanedUp) return;
-console.log('[routes.js.423:cleanedUp:]',cleanedUp); //TODO
           cleanedUp = true;
           e2.parentNode.removeChild(e2);
           e2.innerHTML = "";
@@ -488,8 +487,9 @@ console.log('[routes.js.423:cleanedUp:]',cleanedUp); //TODO
           return true;
         } else {
           var sc;
-          var contentDiv = e.getElementsByClassName('content');
-          if (contentDiv) 
+          // Keep prefDiv scroll
+          var contentDiv  = e.getElementsByClassName('content');
+          if (contentDiv && contentDiv[0]) 
             sc = contentDiv[0].scrollTop;
 
           cachedBackPanel = e.cloneNode(true);