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 subtitle position after seek in chrome

Browse source
This commit is contained in:
Luke Pulverenti 2016-02-20 01:57:17 -05:00
parent bcfec3d6fc
commit 70be2ac62e
4 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js vendored
View file

@ -198,7 +198,8 @@ define(['browser'], function (browser) {
Type: 'Video', Type: 'Video',
AudioCodec: videoAudioCodecs.join(','), AudioCodec: videoAudioCodecs.join(','),
VideoCodec: 'h264', VideoCodec: 'h264',
Context: 'Streaming' Context: 'Streaming',
CopyTimestamps: true
}); });
} }

16
dashboard-ui/css/site.css
View file

@ -43,7 +43,7 @@ html .ui-panel-page-container-a {
html .ui-bar-a a, html .ui-bar-a a,
html .ui-body-a a, html .ui-body-a a,
html body .ui-group-theme-a a { html body .ui-group-theme-a a {
color: #3388cc /*{a-link-color}*/; color: #388E3C /*{a-link-color}*/;
font-weight: bold; font-weight: bold;
} }
@ -51,21 +51,21 @@ html body .ui-group-theme-a a {
html .ui-bar-a a:visited, html .ui-bar-a a:visited,
html .ui-body-a a:visited, html .ui-body-a a:visited,
html body .ui-group-theme-a a:visited { html body .ui-group-theme-a a:visited {
color: #3388cc /*{a-link-visited}*/; color: #388E3C /*{a-link-visited}*/;
} }
.ui-page-theme-a a:hover, .ui-page-theme-a a:hover,
html .ui-bar-a a:hover, html .ui-bar-a a:hover,
html .ui-body-a a:hover, html .ui-body-a a:hover,
html body .ui-group-theme-a a:hover { html body .ui-group-theme-a a:hover {
color: #005599 /*{a-link-hover}*/; color: #1B5E20 /*{a-link-hover}*/;
} }
.ui-page-theme-a a:active, .ui-page-theme-a a:active,
html .ui-bar-a a:active, html .ui-bar-a a:active,
html .ui-body-a a:active, html .ui-body-a a:active,
html body .ui-group-theme-a a:active { html body .ui-group-theme-a a:active {
color: #005599 /*{a-link-active}*/; color: #1B5E20 /*{a-link-active}*/;
} }
/* Button up */ /* Button up */
@ -171,20 +171,20 @@ html .ui-panel-page-container-b {
/* Links */ /* Links */
.ui-body-b a { .ui-body-b a {
color: #22aadd /*{b-link-color}*/; color: #52B54B /*{b-link-color}*/;
font-weight: bold; font-weight: bold;
} }
.ui-body-b a:visited { .ui-body-b a:visited {
color: #22aadd /*{b-link-visited}*/; color: #52B54B /*{b-link-visited}*/;
} }
.ui-body-b a:hover { .ui-body-b a:hover {
color: #0088bb /*{b-link-hover}*/; color: #2E7D32 /*{b-link-hover}*/;
} }
.ui-body-b a:active { .ui-body-b a:active {
color: #0088bb /*{b-link-active}*/; color: #2E7D32 /*{b-link-active}*/;
} }
/* Button up */ /* Button up */

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

@ -522,10 +522,11 @@
// Safari uses integers for the mode property // Safari uses integers for the mode property
// http://www.jwplayer.com/html5/scripting/ // http://www.jwplayer.com/html5/scripting/
// edit: not anymore
var useNumericMode = false; var useNumericMode = false;
if (!isNaN(allTracks[i].mode)) { if (!isNaN(allTracks[i].mode)) {
useNumericMode = true; //useNumericMode = true;
} }
if (useNumericMode) { if (useNumericMode) {

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

@ -705,7 +705,10 @@
if (mediaUrl.indexOf('.mkv') == -1) { if (mediaUrl.indexOf('.mkv') == -1) {
mediaUrl += '&EnableAutoStreamCopy=false'; mediaUrl += '&EnableAutoStreamCopy=false';
} }
if (mediaUrl.toLowerCase().indexOf('copytimestamps=true') == -1) {
startTimeTicksOffset = startPosition || 0; startTimeTicksOffset = startPosition || 0;
}
contentType = 'video/' + mediaSource.TranscodingContainer; contentType = 'video/' + mediaSource.TranscodingContainer;
} }