From cb04b81bf43ad70906e2af4d22f67448822de047 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 15 Jun 2014 12:16:35 +0200
Subject: [PATCH] js: Simplify _send() rejections

---
 js/src/mopidy.js | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/js/src/mopidy.js b/js/src/mopidy.js
index 1667f9b1..32ae7e8e 100644
--- a/js/src/mopidy.js
+++ b/js/src/mopidy.js
@@ -141,33 +141,22 @@ Mopidy.prototype._handleWebSocketError = function (error) {
 };
 
 Mopidy.prototype._send = function (message) {
-    var deferred = when.defer();
-
     switch (this._webSocket.readyState) {
     case Mopidy.WebSocket.CONNECTING:
-        deferred.resolver.reject({
-            message: "WebSocket is still connecting"
-        });
-        break;
+        return when.reject({message: "WebSocket is still connecting"});
     case Mopidy.WebSocket.CLOSING:
-        deferred.resolver.reject({
-            message: "WebSocket is closing"
-        });
-        break;
+        return when.reject({message: "WebSocket is closing"});
     case Mopidy.WebSocket.CLOSED:
-        deferred.resolver.reject({
-            message: "WebSocket is closed"
-        });
-        break;
+        return when.reject({message: "WebSocket is closed"});
     default:
+        var deferred = when.defer();
         message.jsonrpc = "2.0";
         message.id = this._nextRequestId();
         this._pendingRequests[message.id] = deferred.resolver;
         this._webSocket.send(JSON.stringify(message));
         this.emit("websocket:outgoingMessage", message);
+        return deferred.promise;
     }
-
-    return deferred.promise;
 };
 
 Mopidy.prototype._nextRequestId = (function () {