andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

js: Simplify _send() rejections

Browse Source
This commit is contained in:
Stein Magnus Jodal 2014-06-15 12:16:35 +02:00
parent eec51a1e83
commit cb04b81bf4
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/src/mopidy.js
View File

@ -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 () {