anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix loading spinner for create and join

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-01-14 15:24:46 -03:00
commit b018028b17
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/controllers/join.js
View file

@ -127,13 +127,13 @@ angular.module('copayApp.controllers').controller('JoinController',
return; return;
} }
$scope.loading = true; $rootScope.starting = true;
identityService.joinWallet({ identityService.joinWallet({
secret: $scope.connectionId, secret: $scope.connectionId,
nickname: $scope.nickname, nickname: $scope.nickname,
privateHex: $scope.private, privateHex: $scope.private,
}, function(err) { }, function(err) {
$scope.loading = false; $rootScope.starting = false;
if (err) { if (err) {
if (err === 'joinError') if (err === 'joinError')
notification.error('Fatal error connecting to Insight server'); notification.error('Fatal error connecting to Insight server');

6
views/create.html
View file

@ -1,8 +1,8 @@
<div ng-controller="CreateController"> <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 ng-include="'views/includes/loading.html'" ng-init="title = 'Creating wallet'"></div>
</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> <form name="setupForm" ng-submit="create(setupForm)" novalidate>
<div class="row"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns">
@ -75,7 +75,7 @@
<div class="text-right"> <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 Create {{requiredCopayers}}-of-{{totalCopayers}} wallet
</button> </button>
</div> </div>

5
views/join.html
View file

@ -1,9 +1,9 @@
<div class="join" ng-controller="JoinController"> <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 ng-include="'views/includes/loading.html'" ng-init="title = 'Connecting to Insight Wallet Server'"></div>
</div> </div>
<div ng-show="!loading"> <div ng-show="!$root.starting">
<div class="row hide-for-large-up"> <div class="row hide-for-large-up">
<div class="large-12 medium-12 small-12 columns"> <div class="large-12 medium-12 small-12 columns">
<h1>{{$root.title}}</h1> <h1>{{$root.title}}</h1>
@ -73,7 +73,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- End !loading -->
</div> </div>
<div class="extra-margin-bottom"></div> <div class="extra-margin-bottom"></div>