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

update polymer

Browse source
This commit is contained in:
Luke Pulverenti 2015-10-05 22:50:20 -04:00
parent d2bb0d6805
commit d96a2b7946
28 changed files with 109 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/apiclient/apiclient.js
View file

@ -166,7 +166,7 @@
var accessToken = currentServerInfo.AccessToken;
if (accessToken) {
headers['X-MediaBrowser-Token'] = accessToken;
headers['X-Emby-Token'] = accessToken;
}
};
@ -356,6 +356,10 @@
throw new Error("serverAddress is yet not set");
}
if (url.toLowerCase().indexOf('/emby') == -1) {
url += '/emby';
}
if (name.charAt(0) != '/') {
url += '/';
}
@ -407,7 +411,7 @@
throw new Error("Cannot open web socket without access token.");
}
var url = serverAddress.replace('http', 'ws');
var url = self.getUrl("socket").replace("/socket", "").replace('http', 'ws');
url += "?api_key=" + accessToken;
url += "&deviceId=" + deviceId;

18
dashboard-ui/apiclient/connectionmanager.js
View file

@ -79,9 +79,13 @@
}
}
function getEmbyServerUrl(baseUrl, handler) {
return baseUrl + "/emby/" + handler;
}
function tryConnect(url, timeout) {
url += "/system/info/public";
url = getEmbyServerUrl(url, "system/info/public");
logger.log('tryConnect url: ' + url);
@ -399,14 +403,14 @@
var url = MediaBrowser.ServerInfo.getServerAddress(server, connectionMode);
url += "/Connect/Exchange?format=json&ConnectUserId=" + credentials.ConnectUserId;
url = getEmbyServerUrl(url, "Connect/Exchange?format=json&ConnectUserId=" + credentials.ConnectUserId);
return HttpClient.send({
type: "GET",
url: url,
dataType: "json",
headers: {
"X-MediaBrowser-Token": server.ExchangeToken
"X-Emby-Token": server.ExchangeToken
}
}).done(function (auth) {
@ -430,10 +434,10 @@
HttpClient.send({
type: "GET",
url: url + "/system/info",
url: getEmbyServerUrl(url, "System/Info"),
dataType: "json",
headers: {
"X-MediaBrowser-Token": server.AccessToken
"X-Emby-Token": server.AccessToken
}
}).done(function (systemInfo) {
@ -445,10 +449,10 @@
HttpClient.send({
type: "GET",
url: url + "/users/" + server.UserId,
url: getEmbyServerUrl(url, "users/" + server.UserId),
dataType: "json",
headers: {
"X-MediaBrowser-Token": server.AccessToken
"X-Emby-Token": server.AccessToken
}
}).done(function (user) {