ARCHIVE/xahau.js
1
0
Fork 0
mirror of https://github.com/Xahau/xahau.js.git synced 2026-06-02 16:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #560 from wltsmrz/fix-connect-when-already-connected

Browse Source 
Always call Remote.connect() callback
This commit is contained in:
wltsmrz
2015-09-22 21:51:30 -07:00
parent 0448696bd8 1c023c4377
commit 368ac0b9e0
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/remote.js
View File

@@ -421,22 +421,23 @@ Remote.prototype.reconnect = function() {
/**
* Connect to the Ripple network
*
* @param {Function} [callback]
* @param [Function] [callback]
* @api public
*/
Remote.prototype.connect = function(callback) {
if (!this._servers.length) {
Remote.prototype.connect = function(callback = function() {}) {
if (_.isEmpty(this._servers)) {
throw new Error('No servers available.');
}
if (typeof callback === 'function') {
this.once('connect', callback);
if (this.isConnected()) {
callback();
return this;
}
this.once('connect', callback);
this._should_connect = true;
this._servers.forEach(function(server) {
this._servers.forEach(server => {
server.connect();
});
@@ -450,25 +451,19 @@ Remote.prototype.connect = function(callback) {
* @api public
*/
Remote.prototype.disconnect = function(callback_) {
if (!this._servers.length) {
Remote.prototype.disconnect = function(callback = function() {}) {
if (_.isEmpty(this._servers)) {
throw new Error('No servers available, not disconnecting');
}
const callback = _.isFunction(callback_)
? callback_
: function() {};
this._should_connect = false;
if (!this.isConnected()) {
callback();
return this;
}
this._should_connect = false;
this.once('disconnect', callback);
this._servers.forEach(function(server) {
this._servers.forEach(server => {
server.disconnect();
});