1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

more jqm tear down

This commit is contained in:
Luke Pulverenti 2015-09-03 13:35:08 -04:00
parent 6bf7ea2ea5
commit a310b3aa39
8 changed files with 15 additions and 407 deletions

View file

@ -2547,7 +2547,6 @@
if (showControls && options.showLimit) {
require(['jqmicons']);
var id = "selectPageSize";
var pageSizes = options.pageSizes || LibraryBrowser.getDefaultPageSizeSelections();
@ -2564,7 +2563,7 @@
}).join('');
// Add styles to defeat jquery mobile
html += '<div class="pageSizeContainer"><label style="font-size:inherit;" class="labelPageSize" for="' + id + '">' + Globalize.translate('LabelLimit') + '</label><select class="selectPageSize" id="' + id + '" data-inline="true" data-mini="true">' + optionsHtml + '</select></div>';
html += '<div class="pageSizeContainer"><label style="font-size:inherit;" class="labelPageSize" for="' + id + '">' + Globalize.translate('LabelLimit') + '</label><select style="width:auto;" class="selectPageSize" id="' + id + '" data-inline="true" data-mini="true">' + optionsHtml + '</select></div>';
}
}

View file

@ -75,25 +75,6 @@
return document.fullscreen || document.mozFullScreen || document.webkitIsFullScreen || document.msFullscreenElement ? true : false;
};
self.showChaptersFlyout = function () {
function onFlyoutClose() {
$('.itemVideo').css('visibility', 'visible');
}
require(['jqmicons']);
var html = getChaptersFlyoutHtml();
var elem = $('.videoChaptersPopup').html(html)
.trigger('create')
.popup("option", "positionTo", $('.videoChaptersButton'))
.off('popupafterclose', onFlyoutClose)
.on('popupafterclose', onFlyoutClose);
elem.popup("open").parents(".ui-popup-container").css("margin-top", 30);
};
self.showSubtitleMenu = function () {
var streams = self.currentMediaSource.MediaStreams.filter(function (currentStream) {
@ -596,16 +577,6 @@
self.changeStream(Math.floor(newPositionTicks));
}
self.onChapterOptionSelected = function (elem) {
if (!$(elem).hasClass('selectedMediaPopupOption')) {
var ticks = parseInt(elem.getAttribute('data-value') || '0');
self.changeStream(ticks);
}
$('.videoChaptersPopup').popup('close');
};
self.onAudioOptionSelected = function (index) {
self.setAudioStreamIndex(index);
@ -685,8 +656,6 @@
html += '<paper-icon-button icon="subtitles" class="mediaButton videoSubtitleButton" onclick="MediaPlayer.showSubtitleMenu();"></paper-icon-button>';
html += '<paper-icon-button icon="videocam" class="mediaButton videoChaptersButton" onclick="MediaPlayer.showChaptersFlyout();"></paper-icon-button>';
html += '<paper-icon-button icon="settings" class="mediaButton videoQualityButton" onclick="MediaPlayer.showQualityFlyout();"></paper-icon-button>';
html += '<paper-icon-button icon="close" class="mediaButton" onclick="MediaPlayer.stop();"></paper-icon-button>';
@ -829,86 +798,6 @@
player.removeClass("fullscreenVideo");
}
function getChaptersFlyoutHtml() {
var item = self.currentItem;
var currentTicks = self.getCurrentTicks();
var chapters = item.Chapters || [];
var html = '';
html += '<div class="videoPlayerPopupContent">';
html += '<ul data-role="listview" data-inset="true"><li data-role="list-divider">' + Globalize.translate('HeaderScenes') + '</li>';
html += '</ul>';
html += '<div class="videoPlayerPopupScroller">';
html += '<ul data-role="listview" data-inset="true">';
var index = 0;
html += chapters.map(function (chapter) {
var cssClass = "mediaPopupOption";
var selected = false;
// Need to embed onclick handler due to delegation not working in iOS cordova
var onclick = '';
if (currentTicks >= chapter.StartPositionTicks) {
var nextChapter = chapters[index + 1];
selected = !nextChapter || currentTicks < nextChapter.StartPositionTicks;
}
if (!selected) {
onclick = ' onclick="MediaPlayer.onChapterOptionSelected(this);"';
}
var optionHtml = '<li><a' + onclick + ' data-value="' + chapter.StartPositionTicks + '" class="' + cssClass + '" href="#" style="padding-top:0;padding-bottom:0;">';
var imgUrl = "css/images/media/chapterflyout.png";
if (chapter.ImageTag) {
optionHtml += '<img src="' + imgUrl + '" style="visibility:hidden;" />';
imgUrl = ApiClient.getScaledImageUrl(item.Id, {
width: 160,
tag: chapter.ImageTag,
type: "Chapter",
index: index
});
optionHtml += '<div class="videoChapterPopupImage" style="background-image:url(\'' + imgUrl + '\');"></div>';
} else {
optionHtml += '<img src="' + imgUrl + '" />';
}
// TODO: Add some indicator if selected = true
optionHtml += '<p style="margin:12px 0 0;">';
var textLines = [];
textLines.push(chapter.Name);
textLines.push(Dashboard.getDisplayTime(chapter.StartPositionTicks));
optionHtml += textLines.join('<br/>');
optionHtml += '</p>';
optionHtml += '</a></li>';
index++;
return optionHtml;
}).join('');
html += '</ul>';
html += '</div>';
html += '</div>';
return html;
}
function onPopState() {
// Stop playback on browser back button nav
self.stop();
@ -1065,12 +954,6 @@
$('.videoSubtitleButton').hide();
}
if (item.Chapters && item.Chapters.length && supportsContentOverVideoPlayer()) {
$('.videoChaptersButton').hide();
} else {
$('.videoChaptersButton').hide();
}
var mediaRenderer = new VideoRenderer({
poster: self.getPosterUrl(item)
});