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

update hls stop

Browse source
This commit is contained in:
Luke Pulverenti 2016-03-29 00:26:25 -04:00
parent a560460346
commit ae57b97712
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dashboard-ui/cinemamodeconfiguration.html
View file

@ -22,8 +22,7 @@
<paper-checkbox class="chkUpcomingStreamingTrailers">${OptionUpcomingStreamingMovies}</paper-checkbox> <paper-checkbox class="chkUpcomingStreamingTrailers">${OptionUpcomingStreamingMovies}</paper-checkbox>
<paper-checkbox class="chkOtherTrailers">${OptionOtherTrailers}</paper-checkbox> <paper-checkbox class="chkOtherTrailers">${OptionOtherTrailers}</paper-checkbox>
</div> </div>
<div class="fieldDescription paperCheckboxFieldDescription">${LabelTheseFeaturesRequireSubscriptionHelpAndTrailers}</div> <div class="fieldDescription paperCheckboxFieldDescription"><a class="lnkSupporterLearnMore" href="http://emby.media/premiere" target="_blank">${LabelTheseFeaturesRequireSubscriptionHelpAndTrailers}</a></div>
<div class="fieldDescription paperCheckboxFieldDescription"><a class="lnkSupporterLearnMore" href="http://emby.media/premiere" target="_blank" style="display:none;">${ButtonLearnMore}</a></div>
</div> </div>
<br /> <br />
<div> <div>

14
dashboard-ui/scripts/cinemamodeconfiguration.js
View file

@ -101,6 +101,14 @@
$('.cinemaModeConfigurationForm').off('submit', onSubmit).on('submit', onSubmit); $('.cinemaModeConfigurationForm').off('submit', onSubmit).on('submit', onSubmit);
if (!AppInfo.enableSupporterMembership) {
page.querySelector('.lnkSupporterLearnMore').href = '#';
page.querySelector('.lnkSupporterLearnMore').addEventListener('click', function (e) {
e.preventDefault();
return false;
});
}
}).on('pageshow', "#cinemaModeConfigurationPage", function () { }).on('pageshow', "#cinemaModeConfigurationPage", function () {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
@ -112,12 +120,6 @@
loadPage(page, config); loadPage(page, config);
}); });
if (AppInfo.enableSupporterMembership) {
$('.lnkSupporterLearnMore', page).show();
} else {
$('.lnkSupporterLearnMore', page).hide();
}
}); });
}); });

6
dashboard-ui/scripts/mediaplayer.js
View file

@ -1578,9 +1578,9 @@ define(['appSettings', 'userSettings', 'appStorage'], function (appSettings, use
window.addEventListener("beforeunload", onAppClose); window.addEventListener("beforeunload", onAppClose);
if (browserInfo.safari) { //if (browserInfo.safari) {
document.addEventListener("pause", onAppClose); // document.addEventListener("pause", onAppClose);
} //}
function sendProgressUpdate() { function sendProgressUpdate() {