mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
merge from master
This commit is contained in:
parent
7355fb1f65
commit
74a22f0fe8
3 changed files with 501 additions and 501 deletions
|
@ -168,15 +168,11 @@
|
|||
|
||||
Dashboard.alert({
|
||||
message: Globalize.translate('HeaderSyncRequiresSupporterMembership') + '<br/><p><a href="http://emby.media/premiere" target="_blank">' + Globalize.translate('ButtonLearnMore') + '</a></p>',
|
||||
title: Globalize.translate('HeaderSync'),
|
||||
callback: function () {
|
||||
deferred.reject();
|
||||
}
|
||||
title: Globalize.translate('HeaderSync')
|
||||
});
|
||||
|
||||
}, function () {
|
||||
|
||||
deferred.reject();
|
||||
Dashboard.hideLoadingMsg();
|
||||
|
||||
Dashboard.alert({
|
||||
|
@ -238,12 +234,7 @@
|
|||
|
||||
var url = "http://mb3admin.com/admin/service/user/getPayPalEmail?id=" + pkg.owner;
|
||||
|
||||
fetch(url, { mode: 'no-cors' }).then(function (response) {
|
||||
|
||||
return response.json();
|
||||
|
||||
}).then(function (dev) {
|
||||
|
||||
$.getJSON(url).done(function (dev) {
|
||||
if (dev.payPalEmail) {
|
||||
$('#payPalEmail', page).val(dev.payPalEmail);
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -68,7 +68,7 @@
|
|||
type: "DELETE",
|
||||
url: linkUrl
|
||||
|
||||
}).then(function () {
|
||||
}).done(function () {
|
||||
|
||||
Dashboard.alert({
|
||||
|
||||
|
@ -78,7 +78,7 @@
|
|||
callback: actionCallback
|
||||
|
||||
});
|
||||
}, function () {
|
||||
}).fail(function () {
|
||||
|
||||
Dashboard.alert({
|
||||
|
||||
|
@ -99,7 +99,7 @@
|
|||
},
|
||||
dataType: 'json'
|
||||
|
||||
}).then(function (result) {
|
||||
}).done(function (result) {
|
||||
|
||||
var msgKey = result.IsPending ? 'MessagePendingEmbyAccountAdded' : 'MessageEmbyAccountAdded';
|
||||
|
||||
|
@ -110,8 +110,7 @@
|
|||
callback: actionCallback
|
||||
|
||||
});
|
||||
|
||||
}, function () {
|
||||
}).fail(function () {
|
||||
|
||||
Dashboard.alert({
|
||||
|
||||
|
@ -170,9 +169,9 @@
|
|||
user.Policy.EnableSyncTranscoding = $('#chkEnableSyncTranscoding', page).checked();
|
||||
user.Policy.EnablePublicSharing = $('#chkEnableSharing', page).checked();
|
||||
|
||||
ApiClient.updateUser(user).then(function () {
|
||||
ApiClient.updateUser(user).done(function () {
|
||||
|
||||
ApiClient.updateUserPolicy(user.Id, user.Policy).then(function () {
|
||||
ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () {
|
||||
|
||||
onSaveComplete(page, user);
|
||||
});
|
||||
|
@ -184,7 +183,7 @@
|
|||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
getUser().then(function (result) {
|
||||
getUser().done(function (result) {
|
||||
saveUser(result, page);
|
||||
});
|
||||
|
||||
|
@ -203,7 +202,7 @@
|
|||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
getUser().then(function (user) {
|
||||
getUser().done(function (user) {
|
||||
|
||||
loadUser(page, user);
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue