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 subtitles

Browse source
This commit is contained in:
Luke Pulverenti 2016-03-07 13:50:58 -05:00
parent 053fd6388e
commit d0afade8ed
4 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/bower_components/iron-behaviors/.bower.json vendored
View file

@ -29,14 +29,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"ignore": [],
"homepage": "https://github.com/polymerelements/iron-behaviors",
"homepage": "https://github.com/PolymerElements/iron-behaviors",
"_release": "1.0.13",
"_resolution": {
"type": "version",
"tag": "v1.0.13",
"commit": "a7bc3428a6da2beed21987b3a8028206826a12bc"
},
"_source": "git://github.com/polymerelements/iron-behaviors.git",
"_source": "git://github.com/PolymerElements/iron-behaviors.git",
"_target": "^1.0.0",
"_originalSource": "polymerelements/iron-behaviors"
"_originalSource": "PolymerElements/iron-behaviors"
}

4
dashboard-ui/bower_components/paper-behaviors/.bower.json vendored
View file

@ -45,7 +45,7 @@
"tag": "v1.0.11",
"commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5"
},
"_source": "git://github.com/polymerelements/paper-behaviors.git",
"_source": "git://github.com/PolymerElements/paper-behaviors.git",
"_target": "^1.0.0",
"_originalSource": "polymerelements/paper-behaviors"
"_originalSource": "PolymerElements/paper-behaviors"
}

6
dashboard-ui/bower_components/paper-ripple/.bower.json vendored
View file

@ -32,14 +32,14 @@
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
},
"ignore": [],
"homepage": "https://github.com/polymerelements/paper-ripple",
"homepage": "https://github.com/PolymerElements/paper-ripple",
"_release": "1.0.5",
"_resolution": {
"type": "version",
"tag": "v1.0.5",
"commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
},
"_source": "git://github.com/polymerelements/paper-ripple.git",
"_source": "git://github.com/PolymerElements/paper-ripple.git",
"_target": "^1.0.0",
"_originalSource": "polymerelements/paper-ripple"
"_originalSource": "PolymerElements/paper-ripple"
}

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

@ -513,8 +513,11 @@
function enableNativeTrackSupport(track) {
if (browserInfo.safari) {
if (navigator.userAgent.toLowerCase().indexOf('os x') == -1) {
// Leave it to apple to have different behavior between safari on ios vs osx
return false;
}
}
if (browserInfo.firefox) {
if ((currentSrc || '').toLowerCase().indexOf('.m3u8') != -1) {
@ -594,13 +597,13 @@
trackElement.label = 'manualTrack' + track.index;
// download the track json
fetchSubtitles(track).then(function(data) {
fetchSubtitles(track).then(function (data) {
// show in ui
console.log('downloaded ' + data.TrackEvents.length + ' track events');
// add some cues to show the text
// in safari, the cues need to be added before setting the track mode to showing
data.TrackEvents.forEach(function(trackEvent) {
data.TrackEvents.forEach(function (trackEvent) {
trackElement.addCue(new VTTCue(trackEvent.StartPositionTicks / 10000000, trackEvent.EndPositionTicks / 10000000, trackEvent.Text.replace(/\\N/gi, '\n')));
});
trackElement.mode = 'showing';