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 master

Browse source
This commit is contained in:
Luke Pulverenti 2015-11-30 12:33:30 -05:00
parent 7355fb1f65
commit 74a22f0fe8
3 changed files with 501 additions and 501 deletions
Download patch file Download diff file Expand all files Collapse all files

15
dashboard-ui/scripts/registrationservices.js
View file

@ -132,7 +132,7 @@
document.body.appendChild(dlg); document.body.appendChild(dlg);
// Has to be assigned a z-index after the call to .open() // Has to be assigned a z-index after the call to .open()
dlg.addEventListener('iron-overlay-closed', function (e) { dlg.addEventListener('iron-overlay-closed', function(e) {
appStorage.setItem(supporterPlaybackKey, new Date().getTime()); appStorage.setItem(supporterPlaybackKey, new Date().getTime());
dlg.parentNode.removeChild(dlg); dlg.parentNode.removeChild(dlg);
deferred.resolve(); deferred.resolve();
@ -168,15 +168,11 @@
Dashboard.alert({ Dashboard.alert({
message: Globalize.translate('HeaderSyncRequiresSupporterMembership') + '<br/><p><a href="http://emby.media/premiere" target="_blank">' + Globalize.translate('ButtonLearnMore') + '</a></p>', message: Globalize.translate('HeaderSyncRequiresSupporterMembership') + '<br/><p><a href="http://emby.media/premiere" target="_blank">' + Globalize.translate('ButtonLearnMore') + '</a></p>',
title: Globalize.translate('HeaderSync'), title: Globalize.translate('HeaderSync')
callback: function () {
deferred.reject();
}
}); });
}, function () { }, function () {
deferred.reject();
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
Dashboard.alert({ Dashboard.alert({
@ -238,12 +234,7 @@
var url = "http://mb3admin.com/admin/service/user/getPayPalEmail?id=" + pkg.owner; var url = "http://mb3admin.com/admin/service/user/getPayPalEmail?id=" + pkg.owner;
fetch(url, { mode: 'no-cors' }).then(function (response) { $.getJSON(url).done(function (dev) {
return response.json();
}).then(function (dev) {
if (dev.payPalEmail) { if (dev.payPalEmail) {
$('#payPalEmail', page).val(dev.payPalEmail); $('#payPalEmail', page).val(dev.payPalEmail);

970
dashboard-ui/scripts/site.js
View file

File diff suppressed because it is too large Load diff

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

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