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

Fixing style

Browse source
This commit is contained in:
Matias Pando 2014-12-02 15:13:30 -03:00
commit 0712300580
2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/controllers/history.js
View file

@ -78,17 +78,11 @@ angular.module('copayApp.controllers').controller('HistoryController',
} }
var items = res.items; var items = res.items;
<<<<<<< HEAD
var now = new Date(); var now = new Date();
_.each(items, function(tx) { _.each(items, function(tx) {
tx.ts = tx.minedTs || tx.sentTs; tx.ts = tx.minedTs || tx.sentTs;
tx.rateTs = Math.floor((tx.ts || now) / 1000); tx.rateTs = Math.floor((tx.ts || now) / 1000);
tx.amount = $filter('noFractionNumber')(tx.amount); tx.amount = $filter('noFractionNumber')(tx.amount);
=======
_.each(items, function(r, index) {
r.ts = r.minedTs || r.sentTs;
>>>>>>> Move function getTransactionHistoryCsv to wallet
}); });
var index = _.indexBy(items, 'rateTs'); var index = _.indexBy(items, 'rateTs');

2
views/history.html
View file

@ -130,7 +130,7 @@
<div class="large-9 columns"> <div class="large-9 columns">
<pagination page="currentPage" total-items="totalItems" items-per-page="itemsPerPage" on-select-page="selectPage(page)" max-size="10" /> <pagination page="currentPage" total-items="totalItems" items-per-page="itemsPerPage" on-select-page="selectPage(page)" max-size="10" />
</div> </div>
<div class="large-3 columns m5t text-right size-12 show-for-large-only"> <div class="large-3 columns m5t text-right size-12 show-for-large-up">
<div ng-if="generating"> <div ng-if="generating">
<i class="fi-bitcoin-circle icon-rotate spinner"></i> <i class="fi-bitcoin-circle icon-rotate spinner"></i>
<span translate>Generating file...</span> <span translate>Generating file...</span>