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

merge onEnsureConnectUserDone method with onLocalUserDone

Browse source
This commit is contained in:
grafixeyehero 2019-10-29 00:29:28 +03:00
parent 365240e17a
commit f6a8b81959
1 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/bower_components/apiclient/connectionmanager.js vendored
View file

@ -573,6 +573,9 @@ define(["events", "apiclient", "appStorage"], function (events, apiClientFactory
self.user = function (apiClient) { self.user = function (apiClient) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
function onLocalUserDone(e) { function onLocalUserDone(e) {
if (apiClient && apiClient.getCurrentUserId()) {
apiClient.getCurrentUser().then(function (u) {
localUser = u;
var image = getImageUrl(localUser); var image = getImageUrl(localUser);
resolve({ resolve({
localUser: localUser, localUser: localUser,
@ -580,24 +583,12 @@ define(["events", "apiclient", "appStorage"], function (events, apiClientFactory
imageUrl: image.url, imageUrl: image.url,
supportsImageParams: image.supportsParams, supportsImageParams: image.supportsParams,
}); });
}
function onEnsureConnectUserDone() {
if (apiClient && apiClient.getCurrentUserId()) {
apiClient.getCurrentUser().then(function (u) {
localUser = u;
onLocalUserDone();
}, onLocalUserDone); }, onLocalUserDone);
} else {
onLocalUserDone();
} }
} }
var localUser; var localUser;
var credentials = credentialProvider.credentials();
if (apiClient && apiClient.getCurrentUserId()) { if (apiClient && apiClient.getCurrentUserId()) {
onEnsureConnectUserDone(); onLocalUserDone();
} }
}); });
}; };