1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update script loading

This commit is contained in:
Luke Pulverenti 2015-05-19 15:15:40 -04:00
parent 463ad6cfb1
commit bbdbdf346e
92 changed files with 1062 additions and 518 deletions

View file

@ -345,7 +345,7 @@
return url;
};
self.enableAutomaticNetworking = function (server, connectionMode) {
self.enableAutomaticNetworking = function (server, connectionMode, serverUrl) {
logger.log('Begin enableAutomaticNetworking');
@ -353,12 +353,8 @@
self.connectionMode = connectionMode;
self.enableAutomaticNetwork = true;
var url = connectionMode == MediaBrowser.ConnectionMode.Local ?
self.serverInfo().LocalAddress :
self.serverInfo().RemoteAddress;
logger.log('Setting server address to ' + url);
self.serverAddress(url);
logger.log('Setting server address to ' + serverUrl);
self.serverAddress(serverUrl);
};
self.isWebSocketSupported = function () {
@ -570,12 +566,12 @@
return self.ajax({
type: "POST",
url: url
}).done(done);
}).always(done);
}
var deferred = DeferredBuilder.Deferred();
deferred.resolveWith(null, []);
return deferred.promise().done(done);
return deferred.promise().always(done);
};
function getRemoteImagePrefix(options) {