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

rebase

Browse source
This commit is contained in:
Javier 2016-06-14 15:11:56 -03:00
commit 1dd5bc791d
6 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/paperWallet.html
View file

@ -7,7 +7,7 @@
<div class="content preferences" ng-controller="paperWalletController as paperWallet"> <div class="content preferences" ng-controller="paperWalletController as paperWallet">
<h4 ng-show="!paperWallet.error"></h4> <h4 ng-show="!paperWallet.error"></h4>
<div class="box-notification m20b" ng-show="paperWallet.error"> <div class="box-notification m20b" ng-show="paperWallet.error">
<span classs="text-warning">{{paperWallet.error|translate}}</span> <span class="text-warning">{{paperWallet.error|translate}}</span>
</div> </div>
<form ng-show="!paperWallet.balance" class="oh"> <form ng-show="!paperWallet.balance" class="oh">
<div class="row"> <div class="row">

12
public/views/preferencesHistory.html
View file

@ -6,12 +6,14 @@
<div class="content preferences" ng-controller="preferencesHistory"> <div class="content preferences" ng-controller="preferencesHistory">
<h4></h4> <h4></h4>
<ul class="no-bullet m0" ng-if="!index.isCordova" ng-init="index.updatingTxHistory ? null : csvHistory()"> <ul class="no-bullet m0">
<li ng-if="csvReady"> <li ng-if="csvReady && !index.isCordova" ng-init="index.updatingTxHistory ? null : csvHistory()"
<a ng-csv="csvContent" csv-header="csvHeader" ng-style="{'color':index.backgroundColor}" ng-csv="csvContent" csv-header="csvHeader" filename="Copay-{{index.alias || index.walletName}}.csv">
filename="Copay-{{index.alias || index.walletName}}.csv" translate>Export to file</a> <span ng-style="{'color':index.backgroundColor}" translate>
Export to file
</span>
</li> </li>
<li ng-if="!csvReady"> <li ng-if="!csvReady && !index.isCordova">
<span translate>Export to file [preparing...]</span> <span translate>Export to file [preparing...]</span>
</li> </li>
<li ng-click="clearTransactionHistory()" ng-style="{'color':index.backgroundColor}" translate> <li ng-click="clearTransactionHistory()" ng-style="{'color':index.backgroundColor}" translate>

3
src/js/controllers/backup.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('backupController', angular.module('copayApp.controllers').controller('backupController',
function($rootScope, $scope, $timeout, $log, lodash, profileService, gettext, bwcService, bwsError, walletService, ongoingProcess) { function($rootScope, $scope, $timeout, $log, go, lodash, profileService, gettext, bwcService, bwsError, walletService, ongoingProcess) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
$scope.customWords = []; $scope.customWords = [];
@ -41,7 +41,6 @@ angular.module('copayApp.controllers').controller('backupController',
}; };
$scope.backTo = function(state) { $scope.backTo = function(state) {
console.log(state);
if (state == 'walletHome') if (state == 'walletHome')
go.walletHome(); go.walletHome();
else else

4
src/js/controllers/preferencesBwsUrl.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('preferencesBwsUrlController', angular.module('copayApp.controllers').controller('preferencesBwsUrlController',
function($scope, $log, configService, go, applicationService, profileService, storageService) { function($scope, $log, configService, applicationService, profileService, storageService) {
$scope.error = null; $scope.error = null;
$scope.success = null; $scope.success = null;
@ -44,7 +44,7 @@ angular.module('copayApp.controllers').controller('preferencesBwsUrlController',
opts.bwsFor[walletId] = $scope.bwsurl; opts.bwsFor[walletId] = $scope.bwsurl;
configService.set(opts, function(err) { configService.set(opts, function(err) {
if (err) console.log(err); if (err) $log.debug(err);
storageService.setCleanAndScanAddresses(walletId, function() { storageService.setCleanAndScanAddresses(walletId, function() {
applicationService.restart(); applicationService.restart();
}); });

2
src/js/controllers/preferencesDeleteWords.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('preferencesDeleteWordsController', function(confirmDialog, lodash, notification, profileService, go, gettext) { angular.module('copayApp.controllers').controller('preferencesDeleteWordsController', function($scope, confirmDialog, lodash, notification, profileService, go, gettext) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var msg = gettext('Are you sure you want to delete the recovery phrase?'); var msg = gettext('Are you sure you want to delete the recovery phrase?');
var successMsg = gettext('Recovery phrase deleted'); var successMsg = gettext('Recovery phrase deleted');

2
src/js/controllers/preferencesEmail.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('preferencesEmailController', function($rootScope, go, profileService, walletService) { angular.module('copayApp.controllers').controller('preferencesEmailController', function($rootScope, $scope, go, profileService, walletService) {
$scope.save = function(form) { $scope.save = function(form) {
$scope.error = null; $scope.error = null;
$scope.saving = true; $scope.saving = true;