refactor isChange logic

This commit is contained in:
Manuel Araoz 2014-04-30 19:50:13 -03:00
commit fd9e6cb48a
8 changed files with 89 additions and 66 deletions

View file

@ -18,11 +18,15 @@
<span class="logo"></span>
</div>
<div class="large-9 medium-9 columns text-center p10t" ng-show="$root.wallet">
<div class="large-4 medium-4 columns line-dashed-v">
<div class="large-4 columns line-dashed-v">
<a href="#/addresses" class="has-tip" tooltip-placement="bottom" tooltip="{{$root.wallet.id}}">
<strong><span>{{$root.getWalletDisplay()}}</span></strong>
</a>
<a class="button radius small-icon" href="#" title="Signout" ng-click="signout()"><i class="fi-power"></i></a>
<a class="button radius small-icon" title="Manual Refresh"
ng-disabled="$root.loading"
ng-click="refresh()"><i class="fi-refresh"></i></a>
<a class="button radius small-icon" title="Signout"
ng-click="signout()"><i class="fi-power"></i></a>
</div>
<div class="large-4 medium-4 columns line-dashed-v">
Balance: {{totalBalance || 0}} <i class="fi-bitcoin"></i><br>
@ -248,29 +252,34 @@
<div class="addresses" data-ng-controller="AddressesController">
<div ng-show='$root.wallet.publicKeyRing.isComplete()'>
<div class="row">
<div class="large-9 columns" ng-if="addrs[0]">
<div class="large-9 columns" ng-if="addrInfos[0]">
<div class="large-8 columns">
<a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr)">
<span>{{addr}}</span>
<span ng-if="!isMain[addr]">(change)</span>
<span ng-if="typeof(balanceByAddr[addr]) !== 'undefined'" class="right">
{{balanceByAddr[addr]}} <i class="fi-bitcoin"></i>
</span>
<span ng-if="typeof(balanceByAddr[addr]) === 'undefined'" class="right">
Loading...
<a class="panel db" ng-repeat="addrInfo in addrInfos"
ng-click="selectAddr(addrInfo.address.toString())">
<span>{{addrInfo.address.toString()}}</span>
<span ng-if="addrInfo.isChange">(change)</span>
<span class="right">
<span ng-if="$root.loading">...</span>
<span ng-if="!$root.loading">{{balanceByAddr[addrInfo.address.toString()] || 0}}</span>
<i class="fi-bitcoin"></i>
</span>
</a>
</div>
<div class="large-4 columns line-dashed-v text-center">
<qrcode size="160" data="{{selectedAddr}}"></qrcode>
<p class="m10t" ng-repeat="addr in addrs" ng-if="selectedAddr==addr">
<strong> {{balanceByAddr[addr]}} <i class="fi-bitcoin"></i> </strong>
<p class="m10t">
<strong>
<span ng-if="$root.loading">...</span>
<span ng-if="!$root.loading">{{balanceByAddr[selectedAddr] || 0}}</span>
<i class="fi-bitcoin"></i>
</strong>
</p>
</div>
</div>
<div class="columns text-center" ng-class="{'large-3' : addrs[0]}">
<div class="columns text-center" ng-class="{'large-3' : !!addrInfos[0]}">
<p> Create a New <strong> Address </strong> </p>
<button class="secondary radius expandi new-address" ng-click="newAddr()" ng-disabled="loading" loading="Creating"> Create </button>
<button class="secondary radius expandi new-address" ng-click="newAddr()"
ng-disabled="loading" loading="Creating"> Create </button>
</div>
</div>
</div>