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

Fix Conflicts:

Browse source 
js/controllers/signin.js
This commit is contained in:
Gustavo Cortez 2014-05-06 18:12:24 -03:00
commit 88a7fca8d8
12 changed files with 295 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,6 +65,8 @@ WalletFactory.prototype.fromObj = function(obj) {
}
this.log('### WALLET OPENED:', w.id);
// store imported wallet
w.store();
return w;
};

7
js/models/network/WebRTC.js
View file

@ -28,11 +28,8 @@ function Network(opts) {
mode:'ccm',
ts:parseInt(64),
};
// For using your own peerJs server
self.opts = {};
['port', 'host', 'path', 'debug', 'key'].forEach(function(k) {
this.opts = {};
['config', 'port', 'host', 'path', 'debug', 'key'].forEach(function(k) {
if (opts[k]) self.opts[k] = opts[k];
});
this.cleanUp();