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

use shared image loader

Browse source
This commit is contained in:
Luke Pulverenti 2016-01-16 13:29:08 -05:00
parent a08a1c37ec
commit ad1f82dbaf
17 changed files with 570 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

74
dashboard-ui/bower_components/emby-apiclient/connectionmanager.js vendored
View file

@ -748,44 +748,38 @@
console.log('Begin getConnectServers');
return new Promise(function (resolve, reject) {
if (!credentials.ConnectAccessToken || !credentials.ConnectUserId) {
return Promise.resolve([]);
}
if (!credentials.ConnectAccessToken || !credentials.ConnectUserId) {
resolve([]);
return;
var url = "https://connect.emby.media/service/servers?userId=" + credentials.ConnectUserId;
return ajax({
type: "GET",
url: url,
dataType: "json",
headers: {
"X-Application": appName + "/" + appVersion,
"X-Connect-UserToken": credentials.ConnectAccessToken
}
var url = "https://connect.emby.media/service/servers?userId=" + credentials.ConnectUserId;
ajax({
type: "GET",
url: url,
dataType: "json",
headers: {
"X-Application": appName + "/" + appVersion,
"X-Connect-UserToken": credentials.ConnectAccessToken
}
}).then(function (servers) {
servers = servers.map(function (i) {
return {
ExchangeToken: i.AccessKey,
ConnectServerId: i.Id,
Id: i.SystemId,
Name: i.Name,
RemoteAddress: i.Url,
LocalAddress: i.LocalAddress,
UserLinkType: (i.UserType || '').toLowerCase() == "guest" ? "Guest" : "LinkedUser"
};
});
resolve(servers);
}, function () {
resolve([]);
}).then(function (servers) {
return servers.map(function (i) {
return {
ExchangeToken: i.AccessKey,
ConnectServerId: i.Id,
Id: i.SystemId,
Name: i.Name,
RemoteAddress: i.Url,
LocalAddress: i.LocalAddress,
UserLinkType: (i.UserType || '').toLowerCase() == "guest" ? "Guest" : "LinkedUser"
};
});
}, function () {
return [];
});
}
@ -858,9 +852,8 @@
var info = {
Id: foundServer.Id,
LocalAddress: foundServer.Address,
LocalAddress: convertEndpointAddressToManualAddress(foundServer) || foundServer.Address,
Name: foundServer.Name,
ManualAddress: convertEndpointAddressToManualAddress(foundServer),
DateLastLocalConnection: new Date().getTime()
};
@ -1467,13 +1460,10 @@
self.getRegistrationInfo = function (feature, apiClient) {
if (isConnectUserSupporter()) {
return new Promise(function (resolve, reject) {
resolve({
Name: feature,
IsRegistered: true,
IsTrial: false
});
return Promise.resolve({
Name: feature,
IsRegistered: true,
IsTrial: false
});
}