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

js: Simplify configure function

Browse Source
This commit is contained in:
Stein Magnus Jodal 2012-11-30 11:22:13 +01:00
parent 08dcfd56b1
commit cb9b0f6ba1
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/src/mopidy.js
View File

@ -3,7 +3,7 @@
function Mopidy(settings) {
var mopidy = this;
mopidy._configure(settings || {});
mopidy._settings = mopidy._configure(settings || {});
mopidy._backoffDelay = mopidy._settings.backoffDelayMin;
mopidy._pendingRequests = {};
@ -18,22 +18,18 @@ function Mopidy(settings) {
}
Mopidy.prototype._configure = function (settings) {
var mopidy = this;
mopidy._settings = settings;
mopidy._settings.webSocketUrl =
mopidy._settings.webSocketUrl ||
settings.webSocketUrl =
settings.webSocketUrl ||
"ws://" + document.location.host + "/mopidy/ws/";
if (mopidy._settings.autoConnect !== false) {
mopidy._settings.autoConnect = true;
if (settings.autoConnect !== false) {
settings.autoConnect = true;
}
mopidy._settings.backoffDelayMin =
mopidy._settings.backoffDelayMin || 1000;
mopidy._settings.backoffDelayMax =
mopidy._settings.backoffDelayMax || 64000;
settings.backoffDelayMin = settings.backoffDelayMin || 1000;
settings.backoffDelayMax = settings.backoffDelayMax || 64000;
return settings;
};
Mopidy.prototype._delegateEvents = function () {