sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

add geo module documentation and tests

Browse source
This commit is contained in:
rolux 2011-05-09 10:54:52 +02:00
commit 43fa75c8db
8 changed files with 203 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

3
source/Ox.UI/js/Video/Ox.BlockTimeline.js
View file

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

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

@ -54,7 +54,7 @@ Ox.LargeTimeline = function(options, self) {
left: (v['in'] * self.fps) + 'px',
width: (((v['out'] - v['in']) * self.fps) - 2) + 'px'
})
.html(Ox.highlight(v.value, self.options.find))
.html(Ox.highlight(v.value, self.options.find, 'OxHighlight'))
.appendTo(self.$timeline)
});

3
source/Ox.UI/js/Video/Ox.SmallTimeline.js
View file

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

5
source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js
View file

@ -320,7 +320,10 @@ Ox.VideoEditorPlayer = function(options, self) {
var subtitle = getSubtitle();
if (subtitle != self.subtitle) {
self.subtitle = subtitle;
self.$subtitle.html(Ox.highlight(self.subtitle, self.options.find).replace(/\n/g, '<br/>'));
self.$subtitle.html(
Ox.highlight(self.subtitle, self.options.find, 'Ox.Highlight')
.replace(/\n/g, '<br/>')
);
}
}