1
0
Fork 0
forked from 0x2620/oxjs

blur editing

This commit is contained in:
j 2012-01-10 01:55:38 +05:30
commit ba9423462f
8 changed files with 180 additions and 91 deletions

View file

@ -8,13 +8,13 @@ Ox.SmallVideoTimeline = function(options, self) {
_offset: 0, // hack for cases where all these position: absolute elements have to go into a float: left
disabled: false,
duration: 0,
editing: false,
find: '',
'in': 0,
out: 0,
paused: false,
results: [],
showMilliseconds: 0,
state: 'default',
timeline: '',
type: 'player',
width: 256
@ -122,11 +122,11 @@ Ox.SmallVideoTimeline = function(options, self) {
function getTimelineImage() {
return Ox.SmallVideoTimelineImage({
duration: self.options.duration,
editing: self.options.editing,
'in': self.options['in'],
out: self.options.out,
results: self.options.results,
subtitles: self.options.subtitles,
state: self.options.state,
timeline: self.options.timeline,
width: self.imageWidth,
type: self.options.type
@ -206,18 +206,12 @@ Ox.SmallVideoTimeline = function(options, self) {
self.setOption = function(key, value) {
if (key == 'duration') {
self.$image.options({
duration: value
});
self.$image.options({duration: value});
} else if (key == 'in') {
self.$image.options({
'in': value
});
self.$image.options({'in': value});
self.options.type == 'editor' && setPointMarker('in');
} else if (key == 'out') {
self.$image.options({
out: value
});
self.$image.options({out: value});
self.options.type == 'editor' && setPointMarker('out');
} else if (key == 'paused') {
self.$positionMarker[
@ -226,13 +220,11 @@ Ox.SmallVideoTimeline = function(options, self) {
} else if (key == 'position') {
setPositionMarker();
} else if (key == 'results') {
self.$image.options({
results: value
});
self.$image.options({results: value});
} else if (key == 'state') {
self.$image.options({state: value});
} else if (key == 'subtitles') {
self.$image.options({
subtitles: value
});
self.$image.options({subtitles: value});
} else if (key == 'width') {
setWidth();
}