From 1c023c43774b72963c69e494977151171567c8b0 Mon Sep 17 00:00:00 2001
From: wltsmrz <wltsmrz@gmail.com>
Date: Tue, 22 Sep 2015 08:26:09 -0700
Subject: [PATCH] Always call Remote.connect() callback

Fixes non-resolving Promise in RippleAPI.connect()
---
 src/core/remote.js | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/core/remote.js b/src/core/remote.js
index a6f40892..c39b437a 100644
--- a/src/core/remote.js
+++ b/src/core/remote.js
@@ -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();
   });