BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Important fix for chrome app. Fix updating alternative amount

This commit is contained in:
Gustavo Maximiliano Cortez 2015-04-21 17:00:32 -03:00
parent bfc1c61753
commit 68173e632e
4 changed files with 5 additions and 10 deletions
Show Stats 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: { angular: {
src: [ src: [
'bower_components/fastclick/lib/fastclick.js',
'bower_components/modernizr/modernizr.js',
'bower_components/qrcode-generator/js/qrcode.js', 'bower_components/qrcode-generator/js/qrcode.js',
'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js', 'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js',
'bower_components/moment/min/moment-with-locales.js', 'bower_components/moment/min/moment-with-locales.js',

7
public/views/walletHome.html
View File

@ -18,9 +18,10 @@
<strong>{{index.totalBalanceStr}}</strong> <strong>{{index.totalBalanceStr}}</strong>
</div> </div>
<div class="size-14" <div class="size-14"
ng-class="{'animated fadeIn':!index.hideBalance && index.alternativeBalanceAvailable}" ng-if="index.totalBalanceAlternative">
ng-show="index.alternativeBalanceAvailable"> <span ng-class="{'animated fadeIn':!index.hideBalance}">
{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}} {{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}
</span>
</div> </div>
</div> </div>
</div> </div>

2
src/js/routes.js
View File

@ -7,8 +7,6 @@ if (window && window.navigator) {
var isaosp = (rxaosp && rxaosp[1] < 537); var isaosp = (rxaosp && rxaosp[1] < 537);
if (!window.cordova && isaosp) if (!window.cordova && isaosp)
unsupported = true; unsupported = true;
if (!Modernizr.localstorage)
unsupported = true;
if (unsupported) { if (unsupported) {
window.location = '#/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 // list of files / patterns to load in the browser
files: [ files: [
'bower_components/fastclick/lib/fastclick.js',
'bower_components/modernizr/modernizr.js',
'bower_components/qrcode-generator/js/qrcode.js', 'bower_components/qrcode-generator/js/qrcode.js',
'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js', 'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js',
'bower_components/moment/min/moment-with-locales.js', 'bower_components/moment/min/moment-with-locales.js',