mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
switch to Promise.all
This commit is contained in:
parent
9932bc3eb5
commit
f65465a5ae
25 changed files with 60 additions and 80 deletions
|
@ -53,10 +53,10 @@
|
||||||
parentPathPromise = parentPathPromise.promise();
|
parentPathPromise = parentPathPromise.promise();
|
||||||
}
|
}
|
||||||
|
|
||||||
$.when(promise, parentPathPromise).then(function (response1, response2) {
|
Promise.all(promise, parentPathPromise).then(function (responses) {
|
||||||
|
|
||||||
var folders = response1[0];
|
var folders = responses[0];
|
||||||
var parentPath = response2 && response2.length ? response2[0] || '' : '';
|
var parentPath = responses[1] || '';
|
||||||
|
|
||||||
$('#txtDirectoryPickerPath', page).val(path || "");
|
$('#txtDirectoryPickerPath', page).val(path || "");
|
||||||
|
|
||||||
|
|
|
@ -185,9 +185,9 @@
|
||||||
var promise2 = ApiClient.getInstalledPlugins();
|
var promise2 = ApiClient.getInstalledPlugins();
|
||||||
var promise3 = ApiClient.getPluginSecurityInfo();
|
var promise3 = ApiClient.getPluginSecurityInfo();
|
||||||
|
|
||||||
$.when(promise1, promise2, promise3).then(function (response1, response2, response3) {
|
Promise.all([promise1, promise2, promise3]).then(function (responses) {
|
||||||
|
|
||||||
renderPackage(response1[0], response2[0], response3[0], page);
|
renderPackage(responses[0], responses[1], responses[2], page);
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -10,9 +10,9 @@
|
||||||
|
|
||||||
var promise2 = ApiClient.getInstalledPlugins();
|
var promise2 = ApiClient.getInstalledPlugins();
|
||||||
|
|
||||||
$.when(promise1, promise2).then(function (response1, response2) {
|
Promise.all([promise1, promise2]).then(function (responses) {
|
||||||
renderInstalled(page, response1[0], response2[0]);
|
renderInstalled(page, responses[0], responses[1]);
|
||||||
renderCatalog(page, response1[0], response2[0]);
|
renderCatalog(page, responses[0], responses[1]);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,9 +22,9 @@
|
||||||
var promise1 = ApiClient.getJSON(ApiClient.getUrl('Devices/Info', { Id: id }));
|
var promise1 = ApiClient.getJSON(ApiClient.getUrl('Devices/Info', { Id: id }));
|
||||||
var promise2 = ApiClient.getJSON(ApiClient.getUrl('Devices/Capabilities', { Id: id }));
|
var promise2 = ApiClient.getJSON(ApiClient.getUrl('Devices/Capabilities', { Id: id }));
|
||||||
|
|
||||||
$.when(promise1, promise2).then(function (response1, response2) {
|
Promise.all([promise1, promise2]).then(function (responses) {
|
||||||
|
|
||||||
load(page, response1[0], response2[0]);
|
load(page, responses[0], responses[1]);
|
||||||
|
|
||||||
Dashboard.hideLoadingMsg();
|
Dashboard.hideLoadingMsg();
|
||||||
});
|
});
|
||||||
|
|
|
@ -74,10 +74,10 @@
|
||||||
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
$.when(promise1, promise2).then(function (response1, response2) {
|
Promise.all([promise1, promise2]).then(function (responses) {
|
||||||
|
|
||||||
|
|
||||||
load(page, response2[0].Items, response1[0]);
|
load(page, responses[1].Items, responses[0]);
|
||||||
|
|
||||||
Dashboard.hideLoadingMsg();
|
Dashboard.hideLoadingMsg();
|
||||||
});
|
});
|
||||||
|
|
|
@ -14,11 +14,11 @@
|
||||||
var promise1 = getProfile();
|
var promise1 = getProfile();
|
||||||
var promise2 = ApiClient.getUsers();
|
var promise2 = ApiClient.getUsers();
|
||||||
|
|
||||||
$.when(promise1, promise2).then(function (response1, response2) {
|
Promise.all([promise1, promise2]).then(function (responses) {
|
||||||
|
|
||||||
currentProfile = response1[0];
|
currentProfile = responses[0];
|
||||||
|
|
||||||
renderProfile(page, currentProfile, response2[0]);
|
renderProfile(page, currentProfile, responses[1]);
|
||||||
|
|
||||||
Dashboard.hideLoadingMsg();
|
Dashboard.hideLoadingMsg();
|
||||||
|
|
||||||
|
|
|
@ -52,9 +52,9 @@
|
||||||
var promise1 = ApiClient.getNamedConfiguration("dlna");
|
var promise1 = ApiClient.getNamedConfiguration("dlna");
|
||||||
var promise2 = ApiClient.getUsers();
|
var promise2 = ApiClient.getUsers();
|
||||||
|
|
||||||
$.when(promise1, promise2).then(function (response1, response2) {
|
Promise.all([promise1, promise2]).then(function (responses) {
|
||||||
|
|
||||||
loadPage(page, response1[0], response2[0]);
|
loadPage(page, responses[0], responses[1]);
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -104,11 +104,7 @@
|
||||||
|
|
||||||
function loadChildrenOfRootNode(page, scope, callback) {
|
function loadChildrenOfRootNode(page, scope, callback) {
|
||||||
|
|
||||||
var promise2 = ApiClient.getLiveTvChannels({ limit: 0 });
|
ApiClient.getLiveTvChannels({ limit: 0 }).then(function (result) {
|
||||||
|
|
||||||
$.when(promise2).then(function (response2) {
|
|
||||||
|
|
||||||
var result = response2;
|
|
||||||
|
|
||||||
var nodes = [];
|
var nodes = [];
|
||||||
|
|
||||||
|
|
|
@ -160,7 +160,7 @@
|
||||||
promises.push(loadSection(elem, userId, topParentId, section, sections.length == 1));
|
promises.push(loadSection(elem, userId, topParentId, section, sections.length == 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
$.when(promises).then(function () {
|
Promise.all(promises).then(function () {
|
||||||
Dashboard.hideLoadingMsg();
|
Dashboard.hideLoadingMsg();
|
||||||
|
|
||||||
LibraryBrowser.setLastRefreshed(page);
|
LibraryBrowser.setLastRefreshed(page);
|
||||||
|
|
|
@ -125,7 +125,7 @@
|
||||||
promises.push(loadSection(page, user, displayPreferences, i));
|
promises.push(loadSection(page, user, displayPreferences, i));
|
||||||
}
|
}
|
||||||
|
|
||||||
return $.when(promises);
|
return Promise.all(promises);
|
||||||
}
|
}
|
||||||
|
|
||||||
var homePageDismissValue = '14';
|
var homePageDismissValue = '14';
|
||||||
|
|
|
@ -84,10 +84,10 @@
|
||||||
var promise1 = ApiClient.getNewLiveTvTimerDefaults({ programId: programId });
|
var promise1 = ApiClient.getNewLiveTvTimerDefaults({ programId: programId });
|
||||||
var promise2 = ApiClient.getLiveTvProgram(programId, Dashboard.getCurrentUserId());
|
var promise2 = ApiClient.getLiveTvProgram(programId, Dashboard.getCurrentUserId());
|
||||||
|
|
||||||
$.when(promise1, promise2).then(function (response1, response2) {
|
Promise.all([promise1, promise2]).then(function (responses) {
|
||||||
|
|
||||||
var defaults = response1[0];
|
var defaults = responses[0];
|
||||||
var program = response2[0];
|
var program = responses[1];
|
||||||
|
|
||||||
renderRecording(page, defaults, program);
|
renderRecording(page, defaults, program);
|
||||||
});
|
});
|
||||||
|
|
|
@ -418,13 +418,13 @@
|
||||||
return p.getTargets();
|
return p.getTargets();
|
||||||
});
|
});
|
||||||
|
|
||||||
$.when.apply($, promises).then(function () {
|
Promise.all(promises).then(function (responses) {
|
||||||
|
|
||||||
var targets = [];
|
var targets = [];
|
||||||
|
|
||||||
for (var i = 0; i < arguments.length; i++) {
|
for (var i = 0; i < responses.length; i++) {
|
||||||
|
|
||||||
var subTargets = arguments[i];
|
var subTargets = responses[i];
|
||||||
|
|
||||||
for (var j = 0; j < subTargets.length; j++) {
|
for (var j = 0; j < subTargets.length; j++) {
|
||||||
|
|
||||||
|
|
|
@ -880,10 +880,10 @@
|
||||||
return MediaController.supportsDirectPlay(v);
|
return MediaController.supportsDirectPlay(v);
|
||||||
});
|
});
|
||||||
|
|
||||||
$.when.apply($, promises).then(function () {
|
Promise.all(promises).then(function (responses) {
|
||||||
|
|
||||||
for (var i = 0, length = versions.length; i < length; i++) {
|
for (var i = 0, length = versions.length; i < length; i++) {
|
||||||
versions[i].enableDirectPlay = arguments[i] || false;
|
versions[i].enableDirectPlay = responses[i] || false;
|
||||||
}
|
}
|
||||||
var optimalVersion = versions.filter(function (v) {
|
var optimalVersion = versions.filter(function (v) {
|
||||||
|
|
||||||
|
|
|
@ -131,9 +131,9 @@
|
||||||
var promise1 = ApiClient.getNamedConfiguration("chapters");
|
var promise1 = ApiClient.getNamedConfiguration("chapters");
|
||||||
var promise2 = ApiClient.getJSON(ApiClient.getUrl("Providers/Chapters"));
|
var promise2 = ApiClient.getJSON(ApiClient.getUrl("Providers/Chapters"));
|
||||||
|
|
||||||
$.when(promise1, promise2).then(function (response1, response2) {
|
Promise.all([promise1, promise2]).then(function (responses) {
|
||||||
|
|
||||||
loadChapters(page, response1[0], response2[0]);
|
loadChapters(page, responses[0], responses[1]);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -52,9 +52,9 @@
|
||||||
var promise1 = ApiClient.getUsers();
|
var promise1 = ApiClient.getUsers();
|
||||||
var promise2 = ApiClient.getNamedConfiguration(metadataKey);
|
var promise2 = ApiClient.getNamedConfiguration(metadataKey);
|
||||||
|
|
||||||
$.when(promise1, promise2).then(function (response1, response2) {
|
Promise.all([promise1, promise2]).then(function (responses) {
|
||||||
|
|
||||||
loadPage(page, response2[0], response1[0]);
|
loadPage(page, responses[0], responses[0]);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -90,9 +90,9 @@
|
||||||
var promise1 = ApiClient.getNamedConfiguration("subtitles");
|
var promise1 = ApiClient.getNamedConfiguration("subtitles");
|
||||||
var promise2 = ApiClient.getCultures();
|
var promise2 = ApiClient.getCultures();
|
||||||
|
|
||||||
$.when(promise1, promise2).then(function (response1, response2) {
|
Promise.all([promise1, promise2]).then(function (responses) {
|
||||||
|
|
||||||
loadPage(page, response1[0], response2[0]);
|
loadPage(page, responses[0], responses[1]);
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -67,9 +67,9 @@
|
||||||
|
|
||||||
var allCulturesPromise = ApiClient.getCultures();
|
var allCulturesPromise = ApiClient.getCultures();
|
||||||
|
|
||||||
$.when(promise1, promise2).then(function (response1, response2) {
|
Promise.all([promise1, promise2]).then(function (responses) {
|
||||||
|
|
||||||
loadForm(page, response1[0] || response1, response2[0], allCulturesPromise);
|
loadForm(page, responses[1], responses[0], allCulturesPromise);
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -32,12 +32,12 @@
|
||||||
var promise3 = ApiClient.getJSON(ApiClient.getUrl("Notifications/Types"));
|
var promise3 = ApiClient.getJSON(ApiClient.getUrl("Notifications/Types"));
|
||||||
var promise4 = ApiClient.getJSON(ApiClient.getUrl("Notifications/Services"));
|
var promise4 = ApiClient.getJSON(ApiClient.getUrl("Notifications/Services"));
|
||||||
|
|
||||||
$.when(promise1, promise2, promise3, promise4).then(function (response1, response2, response3, response4) {
|
Promise.all([promise1, promise2, promise3, promise4]).then(function (responses) {
|
||||||
|
|
||||||
var users = response1[0];
|
var users = responses[0];
|
||||||
var notificationOptions = response2[0];
|
var notificationOptions = responses[1];
|
||||||
var types = response3[0];
|
var types = responses[2];
|
||||||
var services = response4[0];
|
var services = responses[3];
|
||||||
|
|
||||||
var notificationConfig = notificationOptions.Options.filter(function (n) {
|
var notificationConfig = notificationOptions.Options.filter(function (n) {
|
||||||
|
|
||||||
|
@ -102,10 +102,10 @@
|
||||||
var promise1 = ApiClient.getNamedConfiguration(notificationsConfigurationKey);
|
var promise1 = ApiClient.getNamedConfiguration(notificationsConfigurationKey);
|
||||||
var promise2 = ApiClient.getJSON(ApiClient.getUrl("Notifications/Types"));
|
var promise2 = ApiClient.getJSON(ApiClient.getUrl("Notifications/Types"));
|
||||||
|
|
||||||
$.when(promise1, promise2).then(function (response1, response2) {
|
Promise.all([promise1, promise2]).then(function (responses) {
|
||||||
|
|
||||||
var notificationOptions = response1[0];
|
var notificationOptions = responses[0];
|
||||||
var types = response2[0];
|
var types = responses[1];
|
||||||
|
|
||||||
var notificationConfig = notificationOptions.Options.filter(function (n) {
|
var notificationConfig = notificationOptions.Options.filter(function (n) {
|
||||||
|
|
||||||
|
|
|
@ -22,14 +22,14 @@
|
||||||
|
|
||||||
var promise2 = ApiClient.getInstalledPlugins();
|
var promise2 = ApiClient.getInstalledPlugins();
|
||||||
|
|
||||||
$.when(promise1, promise2).then(function (response1, response2) {
|
Promise.all([promise1, promise2]).then(function (responses) {
|
||||||
|
|
||||||
populateList({
|
populateList({
|
||||||
|
|
||||||
catalogElement: $('#pluginTiles', page),
|
catalogElement: $('#pluginTiles', page),
|
||||||
noItemsElement: $("#noPlugins", page),
|
noItemsElement: $("#noPlugins", page),
|
||||||
availablePlugins: response1[0],
|
availablePlugins: responses[0],
|
||||||
installedPlugins: response2[0]
|
installedPlugins: responses[1]
|
||||||
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -238,9 +238,9 @@
|
||||||
SupportsPersistentIdentifier: true
|
SupportsPersistentIdentifier: true
|
||||||
}));
|
}));
|
||||||
|
|
||||||
$.when(promise1, promise2, promise4, promise5, promise6).then(function (response1, response2, response4, response5, response6) {
|
Promise.all([promise1, promise2, promise4, promise5, promise6]).then(function (responses) {
|
||||||
|
|
||||||
loadUser(page, response1[0] || response1, response2[0], response4[0].Items, response5[0].Items, response6[0].Items);
|
loadUser(page, responses[0], responses[1], responses[2].Items, responses[3].Items, responses[4].Items);
|
||||||
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -70,10 +70,10 @@
|
||||||
|
|
||||||
var promise5 = ApiClient.getJSON(ApiClient.getUrl("Channels"));
|
var promise5 = ApiClient.getJSON(ApiClient.getUrl("Channels"));
|
||||||
|
|
||||||
$.when(promise4, promise5).then(function (response4, response5) {
|
Promise.all([promise4, promise5]).then(function (responses) {
|
||||||
|
|
||||||
loadMediaFolders(page, response4[0].Items);
|
loadMediaFolders(page, responses[0].Items);
|
||||||
loadChannels(page, response5[0].Items);
|
loadChannels(page, responses[1].Items);
|
||||||
|
|
||||||
Dashboard.hideLoadingMsg();
|
Dashboard.hideLoadingMsg();
|
||||||
});
|
});
|
||||||
|
|
|
@ -388,28 +388,12 @@
|
||||||
Dashboard.showLoadingMsg();
|
Dashboard.showLoadingMsg();
|
||||||
|
|
||||||
var userId = getParameterByName("userId");
|
var userId = getParameterByName("userId");
|
||||||
|
var promise1 = ApiClient.getUser(userId);
|
||||||
var promise1;
|
|
||||||
|
|
||||||
if (!userId) {
|
|
||||||
|
|
||||||
var deferred = $.Deferred();
|
|
||||||
|
|
||||||
deferred.resolveWith(null, [{
|
|
||||||
Configuration: {}
|
|
||||||
}]);
|
|
||||||
|
|
||||||
promise1 = deferred.promise();
|
|
||||||
} else {
|
|
||||||
|
|
||||||
promise1 = ApiClient.getUser(userId);
|
|
||||||
}
|
|
||||||
|
|
||||||
var promise2 = ApiClient.getParentalRatings();
|
var promise2 = ApiClient.getParentalRatings();
|
||||||
|
|
||||||
$.when(promise1, promise2).then(function (response1, response2) {
|
Promise.all([promise1, promise2]).then(function (responses) {
|
||||||
|
|
||||||
loadUser(page, response1[0] || response1, response2[0]);
|
loadUser(page, responses[0], responses[1]);
|
||||||
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -50,9 +50,9 @@
|
||||||
var promise2 = apiClient.getCultures();
|
var promise2 = apiClient.getCultures();
|
||||||
var promise3 = apiClient.getCountries();
|
var promise3 = apiClient.getCountries();
|
||||||
|
|
||||||
$.when(promise1, promise2, promise3).then(function (response1, response2, response3) {
|
Promise.all([promise1, promise2, promise3]).then(function (responses) {
|
||||||
|
|
||||||
reloadData(page, response1[0], response2[0], response3[0]);
|
reloadData(page, responses[0], responses[1], responses[2]);
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,9 +57,9 @@
|
||||||
|
|
||||||
var promise2 = apiClient.getJSON(apiClient.getUrl("Localization/Options"));
|
var promise2 = apiClient.getJSON(apiClient.getUrl("Localization/Options"));
|
||||||
|
|
||||||
$.when(promise1, promise2).then(function (response1, response2) {
|
Promise.all([promise1, promise2]).then(function (responses) {
|
||||||
|
|
||||||
loadPage(page, response1[0], response2[0]);
|
loadPage(page, responses[0], responses[1]);
|
||||||
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -598,7 +598,7 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$.when(prerequisites.screen, prerequisites.container).then(function () {
|
Promise.all([prerequisites.screen, prerequisites.container]).then(function () {
|
||||||
if (prerequisites === self._prerequisites) {
|
if (prerequisites === self._prerequisites) {
|
||||||
self._prerequisites = null;
|
self._prerequisites = null;
|
||||||
whenDone();
|
whenDone();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue