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

fix firefox / timing in connection

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-04-20 16:16:09 -03:00
commit 019e841b31
3 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -134,6 +134,7 @@ WalletFactory.prototype.getWalletIds = function() {
WalletFactory.prototype.remove = function(walletId) {
// TODO remove wallet contents
console.log('TODO: remove wallet contents');
};
@ -147,9 +148,13 @@ WalletFactory.prototype.joinCreateSession = function(peerId, cb) {
self.network.start(function() {
self.network.connectTo(peerId);
self.network.on('walletId', function(data) {
data.opts.privateKey = privateKey;
return cb(self.open(data.walletId, data.opts));
self.network.on('data', function(sender, data) {
if (data.type ==='walletId') {
data.opts.privateKey = privateKey;
var w = self.open(data.walletId, data.opts);
w.sendWalletReady(peerId);
return cb(w);
}
});
});
};