fix windows restart hang

This commit is contained in:
Luke Pulverenti 2015-09-30 00:07:21 -04:00
parent 81a6bc5bc7
commit 560230293b
5 changed files with 19 additions and 7 deletions

View File

@ -66,14 +66,14 @@
<p>${MessageSupporterPluginRequiresMembership}</p>
<p><a href="supporter.html">${LinkSupporterMembership}</a></p>
<p><a href="http://emby.media/donate" target="_blank">${LinkSupporterMembership}</a></p>
</div>
<div class="premiumDescription">
<p>${MessagePremiumPluginRequiresMembership}</p>
<p><a href="supporter.html">${LinkSupporterMembership}</a></p>
<p><a href="http://emby.media/donate" target="_blank">${LinkSupporterMembership}</a></p>
</div>
<div class="premiumHasPrice" style="display: none">
<p id="regPrice">

View File

@ -43,7 +43,7 @@
<input type="checkbox" id="chkOtherTrailers" />
</fieldset>
<div class="fieldDescription">${LabelTheseFeaturesRequireSupporterHelpAndTrailers}</div>
<div class="fieldDescription"><a class="lnkSupporterLearnMore" href="supporter.html" style="display:none;">${ButtonLearnMore}</a></div>
<div class="fieldDescription"><a class="lnkSupporterLearnMore" href="http://emby.media/donate" target="_blank" style="display:none;">${ButtonLearnMore}</a></div>
</li>
<li>
<label for="chkMyMovieTrailers">${OptionTrailersFromMyMovies}</label>

View File

@ -799,13 +799,13 @@
imgUrl = "css/images/supporter/supporterbadge.png";
text = Globalize.translate('MessageThankYouForSupporting');
$('.supporterIconContainer', page).html('<a class="imageLink supporterIcon" href="supporter.html" title="' + text + '"><img src="' + imgUrl + '" style="height:32px;vertical-align: middle; margin-right: .5em;" /></a><span style="position:relative;top:2px;text-decoration:none;">' + text + '</span>');
$('.supporterIconContainer', page).html('<a class="imageLink supporterIcon" href="http://emby.media/donate" target="_blank" title="' + text + '"><img src="' + imgUrl + '" style="height:32px;vertical-align: middle; margin-right: .5em;" /></a><span style="position:relative;top:2px;text-decoration:none;">' + text + '</span>');
} else {
imgUrl = "css/images/supporter/nonsupporterbadge.png";
text = Globalize.translate('MessagePleaseSupportProject');
$('.supporterIconContainer', page).html('<a class="imageLink supporterIcon" href="supporter.html" title="' + text + '"><img src="' + imgUrl + '" style="height:32px;vertical-align: middle; margin-right: .5em;" /><span style="position:relative;top:2px;text-decoration:none;">' + text + '</span></a>');
$('.supporterIconContainer', page).html('<a class="imageLink supporterIcon" href="http://emby.media/donate" target="_blank" title="' + text + '"><img src="' + imgUrl + '" style="height:32px;vertical-align: middle; margin-right: .5em;" /><span style="position:relative;top:2px;text-decoration:none;">' + text + '</span></a>');
}
},
@ -1378,7 +1378,7 @@ $(document).on('pageshowready', "#dashboardPage", DashboardPage.onPageShow).on('
$('.supporterPromotion', page).remove();
if (!pluginSecurityInfo.IsMBSupporter && AppInfo.enableSupporterMembership) {
$('.content-primary', page).append('<div class="supporterPromotion"><a class="btn btnActionAccent" href="supporter.html" style="font-size:14px;"><div>' + Globalize.translate('HeaderSupportTheTeam') + '</div><div style="font-weight:normal;font-size:90%;margin-top:5px;">' + Globalize.translate('TextEnjoyBonusFeatures') + '</div></a></div>');
$('.content-primary', page).append('<div class="supporterPromotion"><a class="btn btnActionAccent" href="http://emby.media/donate" target="_blank" style="font-size:14px;"><div>' + Globalize.translate('HeaderSupportTheTeam') + '</div><div style="font-weight:normal;font-size:90%;margin-top:5px;">' + Globalize.translate('TextEnjoyBonusFeatures') + '</div></a></div>');
}
}

View File

@ -83,6 +83,12 @@
$('.currentPlanInfo', page).hide();
}
if (info.IsActiveSupporter) {
$('.supporterContainer', page).addClass('hide');
} else {
$('.supporterContainer', page).removeClass('hide');
}
if (info.IsActiveSupporter && info.PlanType == 'Lifetime') {
$('.planSummary', page)

View File

@ -27,7 +27,13 @@
<p class="planSummary"></p>
</div>
<form style="margin-top:1.5em;" name="_xclick" class="supporterForm" method="post">
<div class="supporterContainer hide">
<br />
<a class="clearLink" href="http://emby.media/donate" target="_blank">
<paper-button raised class="block accent"><iron-icon icon="check"></iron-icon><span>${HeaderBecomeProjectSupporter}</span></paper-button>
</a>
</div>
<form style="margin-top:1.5em;display:none;" name="_xclick" class="supporterForm" method="post">
<fieldset data-role="controlgroup">
<legend>${HeaderDonationType}</legend>