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

some connection in intermediate screen

Browse source
This commit is contained in:
Manuel Araoz 2014-08-18 12:46:51 -04:00
commit 652726dbe9
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -633,7 +633,9 @@ Wallet.prototype.sendReject = function(ntxid) {
}); });
}; };
Wallet.prototype.sendWalletReady = function(recipients) { Wallet.prototype.sendWalletReady = function(recipients) {
preconditions.checkArgument(recipients);
this.log('### SENDING WalletReady TO:', recipients); this.log('### SENDING WalletReady TO:', recipients);
this.send(recipients, { this.send(recipients, {

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

@ -268,7 +268,8 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras
data.opts.passphrase = passphrase; data.opts.passphrase = passphrase;
data.opts.id = data.walletId; data.opts.id = data.walletId;
var w = self.create(data.opts); var w = self.create(data.opts);
w.seedCopayer(s.pubKey); w.sendWalletReady(s.pubKey);
//w.seedCopayer(s.pubKey);
return cb(null, w); return cb(null, w);
} }
}); });

3
js/models/network/Async.js
View file

@ -309,7 +309,8 @@ Network.prototype.start = function(opts, openCallback) {
this.socket.removeAllListeners(); this.socket.removeAllListeners();
} }
this.socket = io.connect(this.host + ':' + this.port, { var hostPort = this.host + ':' + this.port;
this.socket = io.connect(hostPort, {
reconnection: false, reconnection: false,
}); });
this._setupConnectionHandlers(openCallback); this._setupConnectionHandlers(openCallback);