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/userlibraryaccess.js
View file

@ -151,7 +151,7 @@
user.Policy.BlockedChannels = null;
user.Policy.BlockedMediaFolders = null;
ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () {
ApiClient.updateUserPolicy(user.Id, user.Policy).then(function () {
onSaveComplete(page);
});
}
@ -163,7 +163,7 @@
var userId = getParameterByName("userId");
ApiClient.getUser(userId).done(function (result) {
ApiClient.getUser(userId).then(function (result) {
saveUser(result, page);
});
@ -238,9 +238,9 @@
SupportsPersistentIdentifier: true
}));
$.when(promise1, promise2, promise4, promise5, promise6).done(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);
});
});