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

fix subs not starting initially

Browse source
This commit is contained in:
Luke Pulverenti 2015-08-15 17:58:52 -04:00
parent 3009413b24
commit 0154f42bfe
10 changed files with 30 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dashboard-ui/css/card.css
View file

@ -302,12 +302,13 @@
position: relative; position: relative;
} }
.iconCardImage .fa { .iconCardImage iron-icon {
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
position: absolute; position: absolute;
left: 0; left: 0;
right: 0; right: 0;
font-size: 50px; width: 64px;
height: 64px;
margin: auto; margin: auto;
top: 25%; top: 25%;
} }

2
dashboard-ui/itemlist.html
View file

@ -4,7 +4,7 @@
<title></title> <title></title>
</head> </head>
<body> <body>
<div id="itemListPage" data-role="page" class="page libraryPage folderListPage noSecondaryNavPage" data-require="scripts/itemlistpage,jqmicons"> <div id="itemListPage" data-role="page" class="page libraryPage folderListPage noSecondaryNavPage" data-require="scripts/itemlistpage">
<div class="alphabetPicker"> <div class="alphabetPicker">
</div> </div>
<div data-role="content" class="itemListContent"> <div data-role="content" class="itemListContent">

2
dashboard-ui/livetv.html
View file

@ -64,7 +64,7 @@
<div class="tvGuideHeader"> <div class="tvGuideHeader">
<div class="channelTimeslotHeader"> <div class="channelTimeslotHeader">
<div class="timeslotHeaderInner"> <div class="timeslotHeaderInner">
<a class="btnSelectDate" href="#" style="display:block;padding-left:5px;color:#fff;text-decoration:none;font-weight:normal!important;padding:4px 10px 4px 0;"><i class="fa fa-calendar" style="margin-right:3px;"></i><span class="currentDate"></span></a> <a class="btnSelectDate" href="#" style="display:block;padding-left:5px;color:#fff;text-decoration:none;font-weight:normal!important;padding:4px 10px 4px 0;"><iron-icon icon="schedule" style="margin-right:3px;width:18px;height:18px;"></iron-icon><span class="currentDate" style="vertical-align: middle;"></span></a>
</div> </div>
</div> </div>
<div class="timeslotHeaders hiddenScrollX"></div> <div class="timeslotHeaders hiddenScrollX"></div>

34
dashboard-ui/movies.html
View file

@ -4,10 +4,10 @@
<title>Emby</title> <title>Emby</title>
</head> </head>
<body> <body>
<div id="moviesRecommendedPage" data-role="page" class="page libraryPage backdropPage pageWithAbsoluteTabs collectionEditorPage" data-backdroptype="movie" data-require="jqmicons,scripts/moviesrecommended,paperbuttonstyle,scripts/moviestudios,scripts/moviepeople,scripts/moviegenres,scripts/movietrailers,scripts/queryfilters,scripts/movies,scripts/moviecollections"> <div id="moviesRecommendedPage" data-role="page" class="page libraryPage backdropPage pageWithAbsoluteTabs collectionEditorPage" data-backdroptype="movie" data-require="scripts/moviesrecommended,scripts/moviestudios,scripts/moviepeople,scripts/moviegenres,scripts/movietrailers,scripts/queryfilters,scripts/movies,scripts/moviecollections">
<div class="libraryViewNav libraryViewNavWithMinHeight"> <div class="libraryViewNav libraryViewNavWithMinHeight">
<paper-tabs style="display:none;min-width:800px;margin:auto;"> <paper-tabs style="display:none;min-width:770px;margin:auto;">
<paper-tab><iron-icon icon="info"></iron-icon>${TabSuggestions}</paper-tab> <paper-tab><iron-icon icon="info"></iron-icon>${TabSuggestions}</paper-tab>
<paper-tab><iron-icon icon="local-movies"></iron-icon>${TabMovies}</paper-tab> <paper-tab><iron-icon icon="local-movies"></iron-icon>${TabMovies}</paper-tab>
<paper-tab class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</paper-tab> <paper-tab class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</paper-tab>
@ -88,7 +88,6 @@
<div class="viewSettings"> <div class="viewSettings">
<div class="listTopPaging"> <div class="listTopPaging">
</div> </div>
<button class="btnTrailerReel" type="button" data-icon="action" data-inline="true" data-mini="true">${ButtonTrailerReel}</button>
</div> </div>
<div class="itemsContainer"></div> <div class="itemsContainer"></div>
<p class="noItemsMessage" style="display:none;text-align:center;">${MessageNoTrailersFound}</p> <p class="noItemsMessage" style="display:none;text-align:center;">${MessageNoTrailersFound}</p>
@ -504,35 +503,6 @@
</div> </div>
</form> </form>
</div> </div>
<div data-role="popup" class="popup popupTrailerReel" data-theme="a">
<div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
<h3 style="margin: .5em;">${HeaderTrailerReel}</h3>
</div>
<div data-role="content">
<form class="popupTrailerReelForm" style="min-width: 200px;">
<p>${HeaderTrailerReelHelp}</p>
<div>
<label for="chkUnwatchedOnly">${OptionPlayUnwatchedTrailersOnly}</label>
<input id="chkUnwatchedOnly" class="chkUnwatchedOnly" data-mini="true" type="checkbox" />
</div>
<br />
<p>
<button type="submit" data-theme="b" data-icon="check" data-mini="true">
${ButtonOk}
</button>
<button type="button" data-icon="delete" onclick="$(this).parents('.popup').popup('close');" data-mini="true">
${ButtonCancel}
</button>
</p>
</form>
</div>
</div>
<div data-role="panel" class="viewPanel genreViewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true"> <div data-role="panel" class="viewPanel genreViewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
<form> <form>

2
dashboard-ui/mypreferencesmenu.html
View file

@ -5,7 +5,7 @@
<title>Emby</title> <title>Emby</title>
</head> </head>
<body> <body>
<div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-contextname="${HeaderSettings}" data-require="scripts/mypreferencescommon,paperbuttonstyle,jqmicons"> <div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-contextname="${HeaderSettings}" data-require="scripts/mypreferencescommon,paperbuttonstyle">
<style> <style>
.listAvatar.green { .listAvatar.green {

2
dashboard-ui/mysyncsettings.html
View file

@ -5,7 +5,7 @@
<title>Emby</title> <title>Emby</title>
</head> </head>
<body> <body>
<div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-require="scripts/mysyncsettings,paperbuttonstyle,jqmicons" data-backbutton="true" data-menubutton="false"> <div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-require="scripts/mysyncsettings,paperbuttonstyle" data-backbutton="true" data-menubutton="false">
<div data-role="content"> <div data-role="content">
<form class="userProfileSettingsForm" style="margin: 0 auto;"> <form class="userProfileSettingsForm" style="margin: 0 auto;">

2
dashboard-ui/nowplaying.html
View file

@ -4,7 +4,7 @@
<title>Emby</title> <title>Emby</title>
</head> </head>
<body> <body>
<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage" data-contextname="${TitleRemoteControl}" data-theme="b" data-require="scripts/nowplayingpage,paperbuttonstyle,jqmicons"> <div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage" data-contextname="${TitleRemoteControl}" data-theme="b" data-require="scripts/nowplayingpage,paperbuttonstyle">
<div data-role="content" style="overflow:visible;"> <div data-role="content" style="overflow:visible;">

16
dashboard-ui/scripts/htmlmediarenderer.js
View file

@ -360,9 +360,11 @@
requiresSettingStartTimeOnStart = elem.currentTime == 0; requiresSettingStartTimeOnStart = elem.currentTime == 0;
} }
tracks = tracks || [];
if (enableViblast(val)) { if (enableViblast(val)) {
setTracks(elem, tracks || []); setTracks(elem, tracks);
viblast(elem).setup({ viblast(elem).setup({
key: getViblastKey(), key: getViblastKey(),
@ -375,10 +377,20 @@
elem.src = val; elem.src = val;
setTracks(elem, tracks || []); setTracks(elem, tracks);
$(elem).one("loadedmetadata", onLoadedMetadata); $(elem).one("loadedmetadata", onLoadedMetadata);
} }
var currentTrackIndex = -1;
for (var i = 0, length = tracks.length; i < length; i++) {
if (tracks[i].isDefault) {
currentTrackIndex = i;
break;
}
}
self.setCurrentTrackElement(currentTrackIndex);
} }
currentSrc = val; currentSrc = val;

12
dashboard-ui/scripts/librarybrowser.js
View file

@ -1654,32 +1654,32 @@
} else if (item.MediaType == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist") { } else if (item.MediaType == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist") {
if (item.Name && options.showTitle) { if (item.Name && options.showTitle) {
icon = 'fa-music'; icon = 'library-music';
} }
cssClass += " defaultBackground"; cssClass += " defaultBackground";
} else if (item.Type == "Recording" || item.Type == "Program" || item.Type == "TvChannel") { } else if (item.Type == "Recording" || item.Type == "Program" || item.Type == "TvChannel") {
if (item.Name && options.showTitle) { if (item.Name && options.showTitle) {
icon = 'fa-folder-open'; icon = 'folder-open';
} }
cssClass += " defaultBackground"; cssClass += " defaultBackground";
} else if (item.MediaType == "Video" || item.Type == "Season" || item.Type == "Series") { } else if (item.MediaType == "Video" || item.Type == "Season" || item.Type == "Series") {
if (item.Name && options.showTitle) { if (item.Name && options.showTitle) {
icon = 'fa-video-camera'; icon = 'videocam';
} }
cssClass += " defaultBackground"; cssClass += " defaultBackground";
} else if (item.Type == "Person") { } else if (item.Type == "Person") {
if (item.Name && options.showTitle) { if (item.Name && options.showTitle) {
icon = 'fa-user'; icon = 'person';
} }
cssClass += " defaultBackground"; cssClass += " defaultBackground";
} else { } else {
if (item.Name && options.showTitle) { if (item.Name && options.showTitle) {
icon = 'fa-folder-open'; icon = 'folder-open';
} }
cssClass += " defaultBackground"; cssClass += " defaultBackground";
} }
@ -1765,7 +1765,7 @@
html += '<a' + transition + ' class="' + anchorCssClass + '" href="' + href + '"' + defaultActionAttribute + '>'; html += '<a' + transition + ' class="' + anchorCssClass + '" href="' + href + '"' + defaultActionAttribute + '>';
html += '<div class="' + imageCssClass + '" style="' + style + '"' + dataSrc + '>'; html += '<div class="' + imageCssClass + '" style="' + style + '"' + dataSrc + '>';
if (icon) { if (icon) {
html += '<i class="fa ' + icon + '"></i>'; html += '<iron-icon icon="' + icon + '"></iron-icon>';
} }
html += '</div>'; html += '</div>';

47
dashboard-ui/scripts/movietrailers.js
View file

@ -88,15 +88,6 @@
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
Dashboard.getCurrentUser().done(function (user) {
if (user.Policy.EnableMediaPlayback && result.Items.length) {
$('.btnTrailerReel', page).show();
} else {
$('.btnTrailerReel', page).hide();
}
});
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }
@ -130,36 +121,6 @@
$('select.selectPageSize', viewPanel).val(query.Limit).selectmenu('refresh'); $('select.selectPageSize', viewPanel).val(query.Limit).selectmenu('refresh');
} }
function playReel(page) {
$('.popupTrailerReel', page).popup('close');
var reelQuery = {
UserId: Dashboard.getCurrentUserId(),
SortBy: 'Random',
Limit: 50,
Fields: "MediaSources,Chapters"
};
if ($('.chkUnwatchedOnly', page).checked()) {
reelQuery.Filters = "IsPlayed";
}
ApiClient.getJSON(ApiClient.getUrl('Trailers', reelQuery)).done(function (result) {
MediaController.play({
items: result.Items
});
});
}
function onSubmit() {
var page = $(this).parents('.page');
playReel(page);
return false;
}
function initPage(page, tabContent, viewPanel) { function initPage(page, tabContent, viewPanel) {
$('.radioSortBy', viewPanel).on('click', function () { $('.radioSortBy', viewPanel).on('click', function () {
@ -222,14 +183,6 @@
query.StartIndex = 0; query.StartIndex = 0;
reloadItems(tabContent, viewPanel); reloadItems(tabContent, viewPanel);
}); });
$('.btnTrailerReel', tabContent).on('click', function () {
$('.popupTrailerReel', page).popup('open');
});
$('.popupTrailerReelForm', page).off('submit', onSubmit).on('submit', onSubmit);
} }
$(document).on('pageinitdepends', "#moviesRecommendedPage", function () { $(document).on('pageinitdepends', "#moviesRecommendedPage", function () {