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

Merge pull request #2586 from cmgustavo/bug/animated-01

Browse source 
Bug/animated 01
This commit is contained in:
Matias Alejo Garcia 2015-04-21 18:13:12 -03:00
commit 6ab29ca723
5 changed files with 37 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gruntfile.js
View file

@ -78,8 +78,6 @@ module.exports = function(grunt) {
},
angular: {
src: [
'bower_components/fastclick/lib/fastclick.js',
'bower_components/modernizr/modernizr.js',
'bower_components/qrcode-generator/js/qrcode.js',
'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js',
'bower_components/moment/min/moment-with-locales.js',

4
public/views/send.html
View file

@ -115,8 +115,8 @@
</div>
</div>
<div class="text-gray text-center m10t animated infinite flash" ng-show="send.onGoingProcess" >
<span>{{send.onGoingProcess|translate}}...</span>
<div ng-if="send.onGoingProcess" class="text-gray text-center m10t">
<span class="animated infinite flash">{{send.onGoingProcess|translate}}...</span>
</div>

74
public/views/walletHome.html
View file

@ -2,38 +2,42 @@
<div class="row" ng-show="!index.noFocusedWallet">
<div class="amount" ng-style="{'background-color':index.backgroundColor}">
<div ng-show="index.updateError && !index.notAuthorized && !index.anyOnGoingProcess" ng-click='index.openWallet()'>
Could not update Wallet
<br> [Tap to retry]
<div ng-if="!index.anyOnGoingProcess && !index.notAuthorized">
<div ng-show="index.updateError" ng-click='index.openWallet()'>
<span translate>Could not update Wallet</span>
<br>[<span translate>Tap to retry</span>]
</div>
<div ng-show="index.walletScanStatus == 'error'" ng-click='index.retryScan()'>
<span translate>Scan status finished with error</span>
<br>[<span translate>Tap to retry</span>]
</div>
<div ng-show="!index.updateError && index.walletScanStatus != 'error'">
<div class="size-36 animated pulse">
<strong>{{index.totalBalanceStr}}</strong>
</div>
<div ng-show="index.walletScanStatus == 'error' && !index.anyOnGoingProcess" ng-click='index.retryScan()'>
Scan status finished with error
<br> [Tap to retry]
</div>
<div class="size-36" ng-show="!index.anyOnGoingProcess">
<strong>
<span>
<span ng-class="{'animated pulse':!index.anyOnGoingProcess}">{{index.totalBalanceStr }}</span>
</span>
</strong>
</div>
<div class="text-white text-center animated infinite flash" ng-show="index.anyOnGoingProcess" >
<span translate ng-show="index.onGoingProcessName == 'openingWallet'">Opening Wallet...</span>
<span translate ng-show="index.onGoingProcessName == 'updatingStatus'">Updating Status...</span>
<span translate ng-show="index.onGoingProcessName == 'updatingBalance'">Updating Balance...</span>
<span translate ng-show="index.onGoingProcessName == 'updatingPendingTxps'">Updating Pending Transactions...</span>
<span translate ng-show="index.onGoingProcessName == 'scanning'">Scanning Wallet funds...</span>
<span translate ng-show="index.onGoingProcessName == 'recreating'">Recreating Wallet on BWS...</span>
</div>
<div class="size-14" ng-show="!index.anyOnGoingProcess && index.alternativeBalanceAvailable">
<span ng-class="{'animated fadeIn':!index.hideBalance}">{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}</span>
<div class="size-14"
ng-if="index.totalBalanceAlternative">
<span ng-class="{'animated fadeIn':!index.hideBalance}">
{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}
</span>
</div>
</div>
</div>
<div ng-if="index.anyOnGoingProcess" class="text-white text-center">
<div class="animated infinite flash">
<span translate ng-show="index.onGoingProcessName == 'openingWallet'">Opening Wallet...</span>
<span translate ng-show="index.onGoingProcessName == 'updatingStatus'">Updating Status...</span>
<span translate ng-show="index.onGoingProcessName == 'updatingBalance'">Updating Balance...</span>
<span translate ng-show="index.onGoingProcessName == 'updatingPendingTxps'">Updating Pending Transactions...</span>
<span translate ng-show="index.onGoingProcessName == 'scanning'">Scanning Wallet funds...</span>
<span translate ng-show="index.onGoingProcessName == 'recreating'">Recreating Wallet on BWS...</span>
</div>
</div>
</div>
<div class="pr columns line-b">
<div class="avatar-wallet left"
ng-style="{'background-color':index.backgroundColor}">{{index.walletName | limitTo: 1}}</div>
@ -95,15 +99,9 @@
</div>
<div ng-if="!index.requiresMultipleSignatures && index.txps[0]">
<div class="row">
<div class="large-12 columns">
<div class="panel oh">
<h2 class="line-b" translate>Unsent transactions</h2>
<div class="last-transactions pr" ng-repeat="tx in index.txps"
ng-include="'views/includes/transaction.html'">
</div>
</div>
</div>
<h4 class="title m0" translate>Unsent transactions</h4>
<div class="last-transactions pr" ng-repeat="tx in index.txps"
ng-include="'views/includes/transaction.html'">
</div>
</div>

2
src/js/routes.js
View file

@ -7,8 +7,6 @@ if (window && window.navigator) {
var isaosp = (rxaosp && rxaosp[1] < 537);
if (!window.cordova && isaosp)
unsupported = true;
if (!Modernizr.localstorage)
unsupported = true;
if (unsupported) {
window.location = '#/unsupported';
}

2
test/karma.conf.js
View file

@ -15,8 +15,6 @@ module.exports = function(config) {
// list of files / patterns to load in the browser
files: [
'bower_components/fastclick/lib/fastclick.js',
'bower_components/modernizr/modernizr.js',
'bower_components/qrcode-generator/js/qrcode.js',
'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js',
'bower_components/moment/min/moment-with-locales.js',