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 from dev

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/scripts/wizardstartpage.js
View file

@ -17,7 +17,7 @@
var apiClient = ApiClient;
apiClient.getJSON(apiClient.getUrl('Startup/Configuration')).done(function (config) {
apiClient.getJSON(apiClient.getUrl('Startup/Configuration')).then(function (config) {
config.UICulture = $('#selectLocalizationLanguage', page).val();
@ -27,7 +27,7 @@
data: config,
url: apiClient.getUrl('Startup/Configuration')
}).done(function () {
}).then(function () {
Dashboard.navigate('wizarduser.html');
@ -57,9 +57,9 @@
var promise2 = apiClient.getJSON(apiClient.getUrl("Localization/Options"));
$.when(promise1, promise2).done(function (response1, response2) {
Promise.all([promise1, promise2]).then(function (responses) {
loadPage(page, response1[0], response2[0]);
loadPage(page, responses[0], responses[1]);
});
});