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

Merge pull request #1716 from matiaspando/iss1700

Browse source 
Replaced a call to a function for a variable
This commit is contained in:
Matias Alejo Garcia 2014-11-04 13:08:47 -03:00
commit e59fc26f0d
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
js/controllers/copayers.js
View file

@ -6,6 +6,7 @@ angular.module('copayApp.controllers').controller('CopayersController',
$rootScope.title = 'Waiting copayers for ' + $rootScope.wallet.getName(); $rootScope.title = 'Waiting copayers for ' + $rootScope.wallet.getName();
} }
$scope.loading = false; $scope.loading = false;
$scope.secret = $rootScope.wallet.getSecret();
$scope.goToWallet = function() { $scope.goToWallet = function() {
controllerUtils.updateAddressList(); controllerUtils.updateAddressList();

1
js/services/controllerUtils.js
View file

@ -293,7 +293,6 @@ angular.module('copayApp.services')
w = w || $rootScope.wallet; w = w || $rootScope.wallet;
if (!w) return root.onErrorDigest(); if (!w) return root.onErrorDigest();
if (!w.isReady()) return; if (!w.isReady()) return;
console.log('## Updating balance of:' + w.id)
w.balanceInfo = {}; w.balanceInfo = {};
var scope = root.isFocusedWallet(w.id) ? $rootScope : w.balanceInfo; var scope = root.isFocusedWallet(w.id) ? $rootScope : w.balanceInfo;

6
views/copayers.html
View file

@ -14,11 +14,11 @@
<small>{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}</small> <small>{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}</small>
</h2> </h2>
<div class="text-center"> <div class="text-center">
<qrcode size="250" data="{{$root.wallet.getSecret()}}"></qrcode> <qrcode size="250" data="{{secret}}"></qrcode>
</div> </div>
<div class="secret m20t"> <div class="secret m20t">
{{$root.wallet.getSecret()}} {{secret}}
<span class="btn-copy" clip-copy="$root.wallet.getSecret()"></span> <span class="btn-copy" clip-copy="secret"></span>
</div> </div>
</div> </div>
</div> </div>