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

17
dashboard-ui/scripts/useredit.js
View file

@ -68,7 +68,7 @@
type: "DELETE",
url: linkUrl
}).done(function () {
}).then(function () {
Dashboard.alert({
@ -78,7 +78,7 @@
callback: actionCallback
});
}).fail(function () {
}, function () {
Dashboard.alert({
@ -99,7 +99,7 @@
},
dataType: 'json'
}).done(function (result) {
}).then(function (result) {
var msgKey = result.IsPending ? 'MessagePendingEmbyAccountAdded' : 'MessageEmbyAccountAdded';
@ -110,7 +110,8 @@
callback: actionCallback
});
}).fail(function () {
}, function () {
Dashboard.alert({
@ -169,9 +170,9 @@
user.Policy.EnableSyncTranscoding = $('#chkEnableSyncTranscoding', page).checked();
user.Policy.EnablePublicSharing = $('#chkEnableSharing', page).checked();
ApiClient.updateUser(user).done(function () {
ApiClient.updateUser(user).then(function () {
ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () {
ApiClient.updateUserPolicy(user.Id, user.Policy).then(function () {
onSaveComplete(page, user);
});
@ -183,7 +184,7 @@
Dashboard.showLoadingMsg();
getUser().done(function (result) {
getUser().then(function (result) {
saveUser(result, page);
});
@ -202,7 +203,7 @@
Dashboard.showLoadingMsg();
getUser().done(function (user) {
getUser().then(function (user) {
loadUser(page, user);
});