0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

subtitles are html, fixes #845

Browse source
This commit is contained in:
j 2012-06-15 18:26:18 +02:00
parent e443888eba
commit 2a58661c9a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/Ox.UI/js/Video/BlockVideoTimeline.js
View file

@ -215,7 +215,7 @@ Ox.BlockVideoTimeline = function(options, self) {
self.$tooltip.options({ self.$tooltip.options({
title: subtitle title: subtitle
? '<span class=\'OxBright\'>' + Ox.highlight( ? '<span class=\'OxBright\'>' + Ox.highlight(
subtitle.text, self.options.find, 'OxHighlight' subtitle.text, self.options.find, 'OxHighlight', true
).replace(/\n/g, '<br/>') + '</span><br/>' ).replace(/\n/g, '<br/>') + '</span><br/>'
+ Ox.formatDuration(subtitle['in'], 3) + ' - ' + Ox.formatDuration(subtitle['in'], 3) + ' - '
+ Ox.formatDuration(subtitle['out'], 3) + Ox.formatDuration(subtitle['out'], 3)

2
source/Ox.UI/js/Video/LargeVideoTimeline.js
View file

@ -179,7 +179,7 @@ Ox.LargeVideoTimeline = function(options, self) {
width: (((subtitle.out - subtitle['in']) * self.fps) - 2) + 'px' width: (((subtitle.out - subtitle['in']) * self.fps) - 2) + 'px'
}) })
.html(Ox.highlight( .html(Ox.highlight(
subtitle.text, self.options.find, 'OxHighlight' subtitle.text, self.options.find, 'OxHighlight', true
)) ))
.appendTo(self.$timeline); .appendTo(self.$timeline);
}); });