mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Do better to make sure hls files are cleaned up
This commit is contained in:
parent
64a4dba8c4
commit
a05a6dbd46
3 changed files with 65 additions and 22 deletions
|
@ -9,7 +9,7 @@
|
||||||
<div class="libraryViewNav">
|
<div class="libraryViewNav">
|
||||||
<a href="#" class="ui-btn-active tabButton" data-tab="tabNowPlaying">${TabNowPlaying}</a>
|
<a href="#" class="ui-btn-active tabButton" data-tab="tabNowPlaying">${TabNowPlaying}</a>
|
||||||
<a href="#" class="tabButton" data-tab="tabNavigation">${TabControls}</a>
|
<a href="#" class="tabButton" data-tab="tabNavigation">${TabControls}</a>
|
||||||
<!-- <a href="#" class="tabButton" data-tab="tabAdvanced">${TabAdvanced}</a>-->
|
<a href="#" class="tabButton" data-tab="tabAdvanced">${TabAdvanced}</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div data-role="content" style="padding: 1em 0;">
|
<div data-role="content" style="padding: 1em 0;">
|
||||||
|
@ -80,29 +80,48 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="tabAdvanced tabContent" style="display: none;">
|
<div class="tabAdvanced tabContent" style="display: none;">
|
||||||
|
|
||||||
|
<div class="readOnlyContent" style="margin: 0 auto; padding: 0 1em;">
|
||||||
|
|
||||||
|
<div data-role="collapsible">
|
||||||
|
<h2>${HeaderSendMessage}</h2>
|
||||||
|
<div style="text-align: left;">
|
||||||
|
|
||||||
|
<br />
|
||||||
|
<form class="sendMessageForm">
|
||||||
|
<div>
|
||||||
|
<label for="txtMessageTitle">${LabelMessageTitle}</label>
|
||||||
|
<input class="sendMessageElement" type="text" id="txtMessageTitle" required="required" />
|
||||||
|
</div>
|
||||||
|
<br />
|
||||||
|
<div>
|
||||||
|
<label for="txtMessageText">${LabelMessageText}</label>
|
||||||
|
<input class="sendMessageElement" type="text" id="txtMessageText" required="required" />
|
||||||
|
</div>
|
||||||
|
<p>
|
||||||
|
<button class="sendMessageElement" type="submit" data-icon="mail">${ButtonSend}</button>
|
||||||
|
</p>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div data-role="popup" id="popupAudioTrackMenu" data-history="false" data-transition="flip">
|
<div data-role="popup" id="popupAudioTrackMenu" data-history="false" data-transition="flip">
|
||||||
<ul data-role="listview" data-inset="true" style="min-width: 210px;">
|
<div class="trackList"></div>
|
||||||
<li data-role="list-divider">Select Audio</li>
|
|
||||||
<li><a href="#">View details</a></li>
|
|
||||||
<li><a href="#">Edit</a></li>
|
|
||||||
<li><a href="#">Disable</a></li>
|
|
||||||
<li><a href="#">Delete</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div data-role="popup" id="popupSubtitleTrackMenu" data-history="false" data-transition="flip">
|
<div data-role="popup" id="popupSubtitleTrackMenu" data-history="false" data-transition="flip">
|
||||||
<ul data-role="listview" data-inset="true" style="min-width: 210px;">
|
<div class="trackList"></div>
|
||||||
<li data-role="list-divider">Select Subtitles</li>
|
|
||||||
<li><a href="#">View details</a></li>
|
|
||||||
<li><a href="#">Edit</a></li>
|
|
||||||
<li><a href="#">Disable</a></li>
|
|
||||||
<li><a href="#">Delete</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<script type="text/javascript">
|
||||||
|
$('.sendMessageForm').off('submit', NowPlayingPage.onMessageSubmit).on('submit', NowPlayingPage.onMessageSubmit);
|
||||||
|
</script>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -77,7 +77,6 @@
|
||||||
$("#videoControls").removeClass("inactive");
|
$("#videoControls").removeClass("inactive");
|
||||||
$("video").remove();
|
$("video").remove();
|
||||||
$("html").css("cursor", "default");
|
$("html").css("cursor", "default");
|
||||||
$(".ui-loader").hide();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
self.exitFullScreen = function () {
|
self.exitFullScreen = function () {
|
||||||
|
@ -860,7 +859,6 @@
|
||||||
//======================================================================================>
|
//======================================================================================>
|
||||||
|
|
||||||
// Show loading animation
|
// Show loading animation
|
||||||
$(".ui-loader").show();
|
|
||||||
$("html").css("cursor", "wait");
|
$("html").css("cursor", "wait");
|
||||||
|
|
||||||
// Create video player
|
// Create video player
|
||||||
|
@ -996,7 +994,6 @@
|
||||||
self.clearPauseStop();
|
self.clearPauseStop();
|
||||||
|
|
||||||
$("html").css("cursor", "default");
|
$("html").css("cursor", "default");
|
||||||
$(".ui-loader").hide();
|
|
||||||
self.resetEnhancements();
|
self.resetEnhancements();
|
||||||
|
|
||||||
var errorCode = this.error ? this.error.code : '';
|
var errorCode = this.error ? this.error.code : '';
|
||||||
|
@ -1039,7 +1036,6 @@
|
||||||
|
|
||||||
}).on("canplay", function () {
|
}).on("canplay", function () {
|
||||||
|
|
||||||
$(".ui-loader").hide();
|
|
||||||
$("html").css("cursor", "default");
|
$("html").css("cursor", "default");
|
||||||
|
|
||||||
}).on("ended.playbackstopped", function () {
|
}).on("ended.playbackstopped", function () {
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
var elem = $('#popupAudioTrackMenu', page);
|
var elem = $('#popupAudioTrackMenu', page);
|
||||||
|
|
||||||
var html = '<li data-role="list-divider">Select Audio</li>';
|
var html = '<ul data-role="listview" data-inset="true" style="min-width: 210px;"><li data-role="list-divider">Select Audio</li>';
|
||||||
|
|
||||||
html += streams.map(function (s) {
|
html += streams.map(function (s) {
|
||||||
|
|
||||||
|
@ -51,7 +51,9 @@
|
||||||
|
|
||||||
}).join('');
|
}).join('');
|
||||||
|
|
||||||
$('ul', elem).html(html).listview('refresh').trigger('create');
|
html += '</ul>';
|
||||||
|
|
||||||
|
$('.trackList', elem).html(html).listview('refresh').trigger('create');
|
||||||
|
|
||||||
elem.popup('open');
|
elem.popup('open');
|
||||||
}
|
}
|
||||||
|
@ -95,7 +97,7 @@
|
||||||
|
|
||||||
}).join('');
|
}).join('');
|
||||||
|
|
||||||
$('ul', elem).html(html).listview('refresh').trigger('create');
|
$('.trackList', elem).html(html).listview('refresh').trigger('create');
|
||||||
|
|
||||||
elem.popup('open');
|
elem.popup('open');
|
||||||
}
|
}
|
||||||
|
@ -272,6 +274,8 @@
|
||||||
$('.btnSubtitles', page).buttonEnabled(hasStreams(item, 'Subtitle') && supportedCommands.indexOf('SetSubtitleStreamIndex') != -1);
|
$('.btnSubtitles', page).buttonEnabled(hasStreams(item, 'Subtitle') && supportedCommands.indexOf('SetSubtitleStreamIndex') != -1);
|
||||||
$('.btnChapters', page).buttonEnabled(item && item.Chapters && item.Chapters.length);
|
$('.btnChapters', page).buttonEnabled(item && item.Chapters && item.Chapters.length);
|
||||||
|
|
||||||
|
$('.sendMessageElement', page).buttonEnabled(supportedCommands.indexOf('DisplayMessage') != -1);
|
||||||
|
|
||||||
$('.btnStop', page).buttonEnabled(item != null);
|
$('.btnStop', page).buttonEnabled(item != null);
|
||||||
$('.btnNextTrack', page).buttonEnabled(item != null);
|
$('.btnNextTrack', page).buttonEnabled(item != null);
|
||||||
$('.btnPreviousTrack', page).buttonEnabled(item != null);
|
$('.btnPreviousTrack', page).buttonEnabled(item != null);
|
||||||
|
@ -467,4 +471,28 @@
|
||||||
lastPlayerState = null;
|
lastPlayerState = null;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
window.NowPlayingPage = {
|
||||||
|
|
||||||
|
onMessageSubmit: function () {
|
||||||
|
|
||||||
|
var form = this;
|
||||||
|
|
||||||
|
MediaController.sendCommand({
|
||||||
|
Name: 'DisplayMessage',
|
||||||
|
Arguments: {
|
||||||
|
|
||||||
|
Header: $('#txtMessageTitle', form).val(),
|
||||||
|
Text: $('#txtMessageText', form).val()
|
||||||
|
}
|
||||||
|
|
||||||
|
}, currentPlayer);
|
||||||
|
|
||||||
|
$('input', form).val('');
|
||||||
|
Dashboard.alert('Message sent.');
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
})(window, document, jQuery, setTimeout, clearTimeout);
|
})(window, document, jQuery, setTimeout, clearTimeout);
|
Loading…
Add table
Add a link
Reference in a new issue