From b018028b174a97da6402aad61a558451cd99d55f Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 14 Jan 2015 15:24:46 -0300
Subject: [PATCH] fix loading spinner for create and join

---
 js/controllers/join.js | 4 ++--
 views/create.html      | 6 +++---
 views/join.html        | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/js/controllers/join.js b/js/controllers/join.js
index e1029fac2..3234e1bae 100644
--- a/js/controllers/join.js
+++ b/js/controllers/join.js
@@ -127,13 +127,13 @@ angular.module('copayApp.controllers').controller('JoinController',
         return;
       }
 
-      $scope.loading = true;
+      $rootScope.starting = true;
       identityService.joinWallet({
         secret: $scope.connectionId,
         nickname: $scope.nickname,
         privateHex: $scope.private,
       }, function(err) {
-        $scope.loading = false;
+        $rootScope.starting = false;
         if (err) {
           if (err === 'joinError')
             notification.error('Fatal error connecting to Insight server');
diff --git a/views/create.html b/views/create.html
index 58150b70a..e3cadd62e 100644
--- a/views/create.html
+++ b/views/create.html
@@ -1,8 +1,8 @@
 <div ng-controller="CreateController">
-  <div data-alert ng-show="loading">
+  <div ng-show="$root.starting">
     <div ng-include="'views/includes/loading.html'" ng-init="title = 'Creating wallet'"></div>
   </div>
-  <div class="setup" ng-show="!loading && !$root.starting">
+  <div class="setup" ng-show="!$root.starting">
     <form name="setupForm" ng-submit="create(setupForm)" novalidate>
       <div class="row">
         <div class="large-12 columns">
@@ -75,7 +75,7 @@
 
 
             <div class="text-right">
-              <button translate  type="submit" class="button primary expand m0" ng-disabled="setupForm.$invalid || loading">
+              <button translate  type="submit" class="button primary expand m0" ng-disabled="setupForm.$invalid">
                 Create {{requiredCopayers}}-of-{{totalCopayers}} wallet
               </button>
             </div>
diff --git a/views/join.html b/views/join.html
index 15355fbb4..a9ef7b069 100644
--- a/views/join.html
+++ b/views/join.html
@@ -1,9 +1,9 @@
 <div class="join" ng-controller="JoinController">
-  <div ng-show="loading">
+  <div ng-show="$root.starting">
     <div ng-include="'views/includes/loading.html'" ng-init="title = 'Connecting to Insight Wallet Server'"></div>
   </div>
 
-  <div ng-show="!loading">
+  <div ng-show="!$root.starting">
     <div class="row hide-for-large-up">
       <div class="large-12 medium-12 small-12 columns">
         <h1>{{$root.title}}</h1>
@@ -73,7 +73,6 @@
       </div>
     </div>
   </div>
-  <!-- End !loading -->
 </div>
 
 <div class="extra-margin-bottom"></div>