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

- remove editItem from Ox.List

Browse source 
- use ArrayEditable for text too
This commit is contained in:
j 2012-01-04 22:57:32 +05:30
commit 093edd57d0
12 changed files with 180 additions and 403 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@ Ox.BlockVideoTimeline = function(options, self) {
results: [],
showPointMarkers: false,
showSubtitles: false,
state: 'default',
subtitles: [],
width: 0
})
@ -50,16 +51,16 @@ Ox.BlockVideoTimeline = function(options, self) {
setCSS();
self.$image = 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.showSubtitles ? self.options.subtitles : [],
timeline: self.options.getImageURL,
width: Math.round(self.options.duration),
type: self.options.type
});
duration: self.options.duration,
editing: self.options.editing,
'in': self.options['in'],
out: self.options.out,
results: self.options.results,
subtitles: self.options.showSubtitles ? self.options.subtitles : [],
timeline: self.options.getImageURL,
width: Math.round(self.options.duration),
type: 'editor'
});
Ox.loop(self.lines, function(i) {
addLine(i);
@ -217,6 +218,11 @@ Ox.BlockVideoTimeline = function(options, self) {
updateTimelines();
}
function setState() {
self.$image.options({state: self.options.state});
updateTimelines();
}
function setWidth() {
self.lines = getLines();
setCSS();
@ -266,6 +272,8 @@ Ox.BlockVideoTimeline = function(options, self) {
setPositionMarker();
} else if (key == 'results') {
setResults();
} else if (key == 'state') {
setState();
} else if (key == 'width') {
setWidth();
}