getting to intermediate screen!
This commit is contained in:
parent
0ceaea9f95
commit
bfd4bbe021
2 changed files with 12 additions and 5 deletions
|
|
@ -451,10 +451,12 @@ Wallet.prototype.netStart = function(callback) {
|
|||
}
|
||||
|
||||
net.start(startOpts, function() {
|
||||
alert('start callback!');
|
||||
self.emit('ready', net.getPeer());
|
||||
setTimeout(function() {
|
||||
self.emit('publicKeyRingUpdated', true);
|
||||
self.scheduleConnect();
|
||||
//self.scheduleConnect();
|
||||
// no connection logic for now
|
||||
self.emit('txProposalsUpdated');
|
||||
}, 10);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -234,7 +234,7 @@ Network.prototype._onMessage = function(enc) {
|
|||
}
|
||||
};
|
||||
|
||||
Network.prototype._setupConnectionHandlers = function() {
|
||||
Network.prototype._setupConnectionHandlers = function(cb) {
|
||||
preconditions.checkState(this.socket);
|
||||
var self = this;
|
||||
|
||||
|
|
@ -244,6 +244,7 @@ Network.prototype._setupConnectionHandlers = function() {
|
|||
alert('DISCONNECTED');
|
||||
self.cleanUp();
|
||||
});
|
||||
if (typeof cb === 'function') cb();
|
||||
});
|
||||
self.socket.on('message', self._onMessage);
|
||||
self.socket.on('error', self._handleError);
|
||||
|
|
@ -300,7 +301,10 @@ Network.prototype.start = function(opts, openCallback) {
|
|||
if (!this.copayerId)
|
||||
this.setCopayerId(opts.copayerId);
|
||||
|
||||
if (this.connectedPeers.length > 0) return; // Already connected!
|
||||
if (this.connectedPeers.length > 0) {
|
||||
// already connected
|
||||
return;
|
||||
}
|
||||
if (this.socket) {
|
||||
this.socket.destroy();
|
||||
this.socket.removeAllListeners();
|
||||
|
|
@ -309,10 +313,11 @@ Network.prototype.start = function(opts, openCallback) {
|
|||
this.socket = io.connect(this.host + ':' + this.port, {
|
||||
//reconnection: false,
|
||||
});
|
||||
this.socket.emit('subscribe', this.getKey().public.toString('hex'));
|
||||
this._setupConnectionHandlers(openCallback);
|
||||
var pubkey = this.getKey().public.toString('hex');
|
||||
this.socket.emit('subscribe', pubkey);
|
||||
this.socket.emit('sync');
|
||||
this.started = true;
|
||||
this._setupConnectionHandlers();
|
||||
|
||||
//this.emit('serverError', self.criticalError);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue