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

add video editor demo

Browse source
This commit is contained in:
rolux 2011-05-18 18:00:29 +02:00
commit f8ec3fccf4
8 changed files with 5947 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,12 +5,12 @@ Ox.BlockVideoTimeline = function(options, self) {
.defaults({
duration: 0,
find: '',
getImageURL: null,
'in': 0,
out: 0,
position: 0,
results: [],
subtitles: [],
timeline: null,
width: 0
})
.options(options || {})
@ -50,7 +50,7 @@ Ox.BlockVideoTimeline = function(options, self) {
out: self.options.out,
results: self.options.results,
subtitles: self.options.subtitles,
timeline: self.options.timeline,
timeline: self.options.getImageURL,
width: Math.ceil(self.options.duration),
type: self.options.type
});
@ -189,7 +189,9 @@ Ox.BlockVideoTimeline = function(options, self) {
function setCSS() {
that.css({
width: (self.options.width + self.margin) + 'px',
height: ((self.height + self.margin) * self.lines) + 'px'
height: ((self.height + self.margin) * self.lines) + 4 + 'px'
// fixme: the + 4 represent the margin-bottom in the video editor
// is there a better way to get a proper margin-bottom?
});
}