0x2620
/
pandora
2
1
Fork 1
Code Issues 1.3k Pull Requests Releases Wiki Activity

add subtitles offset, fixes #2732

This commit is contained in:
j 2015-04-14 15:53:47 +01:00
parent 589959886b
commit ae55130f47
8 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora/config.0xdb.jsonc
View File

@ -969,6 +969,7 @@
"videoScale": "fit",
"videoSize": "small",
"videoSubtitles": true,
"videoSubtitlesOffset": 0,
"videoTimeline": "antialias",
"videoView": "player",
"videoVolume": 1

1
pandora/config.indiancinema.jsonc
View File

@ -984,6 +984,7 @@
"videoScale": "fit",
"videoSize": "small",
"videoSubtitles": true,
"videoSubtitlesOffset": 0,
"videoTimeline": "slitscan",
"videoView": "player",
"videoVolume": 1

2
pandora/config.padma.jsonc
View File

@ -618,6 +618,7 @@
"id": "transcripts",
"title": "Transcripts",
"canAddAnnotations": {"member": true, "staff": true, "admin": true},
"isSubtitles": true,
"item": "Transcript",
"showInfo": true,
"type": "text"
@ -868,6 +869,7 @@
"videoScale": "fit",
"videoSize": "large",
"videoSubtitles": false,
"videoSubtitlesOffset": 0,
"videoTimeline": "antialias",
"videoView": "player",
"videoVolume": 1

1
pandora/config.pandora.jsonc
View File

@ -911,6 +911,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"videoScale": "fit",
"videoSize": "small",
"videoSubtitles": true,
"videoSubtitlesOffset": 0,
"videoTimeline": "antialias",
"videoView": "player",
"videoVolume": 1

1
static/js/editPanel.js
View File

@ -147,6 +147,7 @@ pandora.ui.editPanel = function(isEmbed) {
})
),
subtitles: getSubtitles(edit.clips),
subtitlesOffset: ui.videoSubtitlesOffset,
timeline: ui.videoTimeline,
timelineTooltip: Ox._('timeline') + ' <span class="OxBright">' + Ox.SYMBOLS.shift + 'T</span>',
video: getVideos(),

1
static/js/editor.js
View File

@ -74,6 +74,7 @@ pandora.ui.editor = function(data) {
subtitles: data.subtitles,
subtitlesDefaultTrack: Ox.getLanguageNameByCode(pandora.site.language),
subtitlesLayer: data.subtitlesLayer,
subtitlesOffset: ui.videoSubtitlesOffset,
subtitlesTrack: Ox.getLanguageNameByCode(pandora.site.language),
timeline: ui.videoTimeline,
timelines: pandora.site.timelines,

1
static/js/embedPlayer.js
View File

@ -104,6 +104,7 @@ pandora.ui.embedPlayer = function() {
scaleToFill: ui.videoScale == 'fill',
showIconOnLoad: true,
subtitles: video.subtitles,
subtitlesOffset: ui.videoSubtitlesOffset,
timeline: options.playInToOut ? function(size, i) {
return pandora.getMediaURL('/' + options.item
+ '/timelineantialias'

1
static/js/player.js
View File

@ -51,6 +51,7 @@ pandora.ui.player = function(data) {
smallTimelineURL: pandora.getMediaURL('/' + ui.item + '/timeline16p.jpg'),
subtitlesDefaultTrack: Ox.getLanguageNameByCode(pandora.site.language),
subtitlesLayer: data.subtitlesLayer,
subtitlesOffset: ui.videoSubtitlesOffset,
subtitlesTrack: Ox.getLanguageNameByCode(pandora.site.language),
timeline: ui.videoTimeline,
timelineTooltip: Ox._('timeline') + ' <span class="OxBright">' + Ox.SYMBOLS.shift + 'T</span>',