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

6
dashboard-ui/scripts/device.js
View file

@ -22,9 +22,9 @@
var promise1 = ApiClient.getJSON(ApiClient.getUrl('Devices/Info', { Id: id }));
var promise2 = ApiClient.getJSON(ApiClient.getUrl('Devices/Capabilities', { Id: id }));
$.when(promise1, promise2).done(function (response1, response2) {
Promise.all([promise1, promise2]).then(function (responses) {
load(page, response1[0], response2[0]);
load(page, responses[0], responses[1]);
Dashboard.hideLoadingMsg();
});
@ -46,7 +46,7 @@
}),
contentType: "application/json"
}).done(Dashboard.processServerConfigurationUpdateResult);
}).then(Dashboard.processServerConfigurationUpdateResult);
}
function onSubmit() {