From 2787a72b7ad50085a7026136c719560af4db5850 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 24 Jul 2014 15:31:07 -0300
Subject: [PATCH] Waiting copayer as a controller

---
 index.html                         |  3 +--
 js/controllers/backup.js           |  8 +-------
 js/controllers/copayers.js         | 21 +++++++++++++++++++++
 js/routes.js                       |  7 +++++++
 views/{includes => }/copayers.html | 13 +++++++------
 5 files changed, 37 insertions(+), 15 deletions(-)
 create mode 100644 js/controllers/copayers.js
 rename views/{includes => }/copayers.html (90%)

diff --git a/index.html b/index.html
index e32a64b97..f08af7079 100644
--- a/index.html
+++ b/index.html
@@ -38,8 +38,6 @@
 
         <div notifications="middle right"></div>
 
-        <div ng-include="'views/includes/copayers.html'"></div>
-
         <div 
           ng-class="{'sidebar' : $root.wallet && $root.wallet.isReady()}"
           ng-include="'views/includes/sidebar.html'" 
@@ -96,6 +94,7 @@
   <script src="js/controllers/home.js"></script>
   <script src="js/controllers/open.js"></script>
   <script src="js/controllers/join.js"></script>
+  <script src="js/controllers/copayers.js"></script>
   <script src="js/controllers/video.js"></script>
   <script src="js/controllers/sidebar.js"></script>
   <script src="js/controllers/addresses.js"></script>
diff --git a/js/controllers/backup.js b/js/controllers/backup.js
index 6a986f21a..df14062c7 100644
--- a/js/controllers/backup.js
+++ b/js/controllers/backup.js
@@ -1,14 +1,8 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('BackupController',
-  function($scope, $rootScope, $location, $window, $timeout, $modal, backupService, walletFactory, controllerUtils) {
+  function($scope, $rootScope, backupService, walletFactory, controllerUtils) {
     
-    $scope.backup = function() {
-      var w = $rootScope.wallet;
-      w.setBackupReady();
-      backupService.download(w);
-    };
-
     $scope.downloadBackup = function() {
       var w = $rootScope.wallet;
       backupService.download(w);
diff --git a/js/controllers/copayers.js b/js/controllers/copayers.js
new file mode 100644
index 000000000..c6a9c2c54
--- /dev/null
+++ b/js/controllers/copayers.js
@@ -0,0 +1,21 @@
+'use strict';
+
+angular.module('copayApp.controllers').controller('CopayersController',
+  function($scope, $rootScope, $location, backupService) {
+
+    $scope.backup = function() {
+      var w = $rootScope.wallet;
+      w.setBackupReady();
+      backupService.download(w);
+    };
+
+    $scope.downloadBackup = function() {
+      var w = $rootScope.wallet;
+      backupService.download(w);
+    }
+
+    $scope.goToWallet = function() {
+      $location.path('/addresses');
+    };
+
+  });
diff --git a/js/routes.js b/js/routes.js
index 96404b25c..3f7308341 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -26,6 +26,10 @@ angular
         templateUrl: 'views/setup.html',
         validate: false
       })
+      .when('/copayers', {
+        templateUrl: 'views/copayers.html',
+        validate: true
+      })
       .when('/addresses', {
         templateUrl: 'views/addresses.html',
         validate: true
@@ -74,6 +78,9 @@ angular
         if ((!$rootScope.wallet || !$rootScope.wallet.id) && next.validate) {
           $location.path('/');
         }
+        if ($rootScope.wallet && !$rootScope.wallet.isReady()) {
+          $location.path('/copayers');
+        }
       }
     });
   })
diff --git a/views/includes/copayers.html b/views/copayers.html
similarity index 90%
rename from views/includes/copayers.html
rename to views/copayers.html
index 77446a47d..c6d7c3434 100644
--- a/views/includes/copayers.html
+++ b/views/copayers.html
@@ -1,7 +1,8 @@
-<div class="waiting-copayers" ng-controller="BackupController" ng-if='$root.wallet && !$root.wallet.isReady() && !loading'>
-  <div class="row">
-     <div class="large-4 columns logo-setup">
-        <img src="../img/logo-negative-beta.svg" alt="Copay">
+<div class="waiting-copayers" ng-controller="CopayersController">
+  <div ng-if='$root.wallet && $root.wallet.isReady()' ng-init="goToWallet()"></div>
+  <div class="row" ng-if='$root.wallet && !$root.wallet.isReady() && !loading'>
+    <div class="large-4 columns logo-setup">
+      <img src="../img/logo-negative-beta.svg" alt="Copay">
     </div>
     <div class="large-8 columns line-dashed-setup-v">
       <div class="box-setup oh">
@@ -44,7 +45,7 @@
               class="waiting br100 no-video"
               ng-if="!hasVideo(copayer)"
               src="./img/satoshi.gif"
-              alt="{{copayer.nick}}"
+              alt="Waiting Copayer"
               width="70">
               <p class="size-12 text-white text-light m0">
               <i class="fi-loop icon-rotate spinner"></i>
@@ -60,7 +61,7 @@
         </div>
 
         <div class="text-right">
-          <a class="text-primary m20r" ng-click="dowloadBackup()"
+          <a class="text-primary m20r" ng-click="downloadBackup()"
             ng-show="!$root.wallet.publicKeyRing.isComplete()">Download seed backup</a>
           <button class="button primary m0"
             ng-click="backup()"