From 2a58661c9a15dd2b2f0980f860792856732bb485 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Fri, 15 Jun 2012 18:26:18 +0200 Subject: [PATCH] subtitles are html, fixes #845 --- source/Ox.UI/js/Video/BlockVideoTimeline.js | 2 +- source/Ox.UI/js/Video/LargeVideoTimeline.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Ox.UI/js/Video/BlockVideoTimeline.js b/source/Ox.UI/js/Video/BlockVideoTimeline.js index 798767c3..3b90676e 100644 --- a/source/Ox.UI/js/Video/BlockVideoTimeline.js +++ b/source/Ox.UI/js/Video/BlockVideoTimeline.js @@ -215,7 +215,7 @@ Ox.BlockVideoTimeline = function(options, self) { self.$tooltip.options({ title: subtitle ? '' + Ox.highlight( - subtitle.text, self.options.find, 'OxHighlight' + subtitle.text, self.options.find, 'OxHighlight', true ).replace(/\n/g, '
') + '

' + Ox.formatDuration(subtitle['in'], 3) + ' - ' + Ox.formatDuration(subtitle['out'], 3) diff --git a/source/Ox.UI/js/Video/LargeVideoTimeline.js b/source/Ox.UI/js/Video/LargeVideoTimeline.js index 8de6e143..131cc27e 100644 --- a/source/Ox.UI/js/Video/LargeVideoTimeline.js +++ b/source/Ox.UI/js/Video/LargeVideoTimeline.js @@ -179,7 +179,7 @@ Ox.LargeVideoTimeline = function(options, self) { width: (((subtitle.out - subtitle['in']) * self.fps) - 2) + 'px' }) .html(Ox.highlight( - subtitle.text, self.options.find, 'OxHighlight' + subtitle.text, self.options.find, 'OxHighlight', true )) .appendTo(self.$timeline); });