better loading

This commit is contained in:
Matias Alejo Garcia 2015-04-24 03:01:26 -03:00
commit ceca507fa5
2 changed files with 10 additions and 2 deletions

View file

@ -408,9 +408,16 @@ history
</div>
<div class="m20t row">
<div class="columns">
<button class="outline light-gray small expand"
ng-click="index.updateTxHistory(index.skipHistory)" ng-show="index.txHistoryPaging && !index.updatingTxHistory">
<span translate>More</span> <i class="icon-arrow-down4 ng-scope"></i>
ng-disabled="index.updatingTxHistory"
ng-click="index.updateTxHistory(index.skipHistory)"
ng-show="index.txHistoryPaging || index.updatingTxHistory"
>
<span ng-show="!index.updatingTxHistory">
<span translate>More</span> <i class="icon-arrow-down4 ng-scope"></i>
</span>
<span translate ng-show="index.updatingTxHistory">Loading...</span>
</button>
</div>
</div>

View file

@ -220,6 +220,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$log.debug('Updating Transaction History');
self.txHistoryError = false;
self.updatingTxHistory = true;
self.txHistoryPaging = false;
$timeout(function() {
$rootScope.$apply();
fc.getTxHistory({