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

update VideoPanelPlayer

Browse source
This commit is contained in:
rlx 2011-08-17 19:34:34 +00:00
commit 91c69d5d23
3 changed files with 100 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

18
source/Ox.UI/js/Video/Ox.VideoEditor.js
View file

@ -225,7 +225,9 @@ Ox.VideoEditor = function(options, self) {
left: self.sizes.timeline[0].left + 'px',
top: self.sizes.timeline[0].top + 'px'
})
.bindEvent('position', changeTimelineLarge)
.bindEvent({
position: changeTimelineLarge
})
.appendTo(self.$editor);
self.$timeline[1] = Ox.BlockVideoTimeline({
@ -246,7 +248,9 @@ Ox.VideoEditor = function(options, self) {
left: self.sizes.timeline[1].left + 'px',
top: self.sizes.timeline[1].top + 'px',
})
.bindEvent('position', changeTimelineSmall)
.bindEvent({
position: changeTimelineSmall
})
.appendTo(self.$editor);
self.$annotations = Ox.Element()
@ -266,14 +270,14 @@ Ox.VideoEditor = function(options, self) {
data.layer = layer.id;
data['in'] = self.options['in'];
data.out = self.options.out;
that.triggerEvent('addAnnotation', data);
that.triggerEvent('addannotation', data);
},
remove: function(event, data) {
data = {
ids: [data],
layer: layer.id
};
that.triggerEvent('removeAnnotations', data);
that.triggerEvent('removeannotations', data);
},
select: function(event, data) {
self.options.layers.forEach(function(l, j) { // fixme: l? j?
@ -877,7 +881,7 @@ Ox.VideoEditor = function(options, self) {
function updateAnnotation(event, data) {
data['in'] = self.options['in'];
data.out = self.options.out;
that.triggerEvent('updateAnnotation', data);
that.triggerEvent('updateannotation', data);
}
function select(type) {
@ -970,8 +974,8 @@ Ox.VideoEditor = function(options, self) {
function toggleAnnotations(event, data) {
self.options.showAnnotations = !data.collapsed;
setSizes();
that.triggerEvent('toggleAnnotations', {
visible: self.options.showAnnotations
that.triggerEvent('toggleannotations', {
showAnnotations: self.options.showAnnotations
});
}