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

Merge pull request #312 from matiu/feature/ux11

Browse source 
Feature/ux11
This commit is contained in:
Manuel Aráoz 2014-05-07 12:22:36 -03:00
commit d58da529c6
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config.template.js
View file

@ -97,10 +97,12 @@ var config = {
host: 'test.insight.is', host: 'test.insight.is',
port: 3001 port: 3001
}, },
verbose: 1, passphrase: {
iterations: 1,
storageSalt: 'mjuBtGybi/4=',
},
themes: ['default'], themes: ['default'],
iterations: 1000, verbose: 1,
storageSalt: 'mjuBtGybi/4=', // choose your own salt (base64)
}; };
var log = function() { var log = function() {

2
js/models/core/Passphrase.js
View file

@ -2,7 +2,7 @@
function Passphrase(config) { function Passphrase(config) {
config = config || {}; config = config || {};
this.salt = config.storageSalt || 'mjuBtGybi/4='; this.salt = config.salt || 'mjuBtGybi/4=';
this.iterations = config.iterations || 1000; this.iterations = config.iterations || 1000;
}; };

2
js/services/passphrase.js
View file

@ -2,6 +2,6 @@
var passphrase; var passphrase;
angular.module('copay.passphrase').factory('Passphrase', function($rootScope) { angular.module('copay.passphrase').factory('Passphrase', function($rootScope) {
passphrase = passphrase || new copay.Passphrase(config); passphrase = passphrase || new copay.Passphrase(config.passphrase);
return passphrase; return passphrase;
}); });