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);
// 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());
dlg.parentNode.removeChild(dlg);
deferred.resolve();
@ -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);