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

trailing comma removal,

Browse source
This commit is contained in:
j 2012-05-26 15:48:19 +00:00
commit 68d50978ba
44 changed files with 87 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -361,7 +361,7 @@ Ox.VideoEditor = function(options, self) {
})
.css({
left: self.sizes.timeline[1].left + 'px',
top: self.sizes.timeline[1].top + 'px',
top: self.sizes.timeline[1].top + 'px'
})
.bindEvent({
edit: function() {
@ -509,12 +509,12 @@ Ox.VideoEditor = function(options, self) {
} else if (id == 'downloadSelection') {
that.triggerEvent('downloadselection', {
'in': self.options['in'],
out: self.options.out,
out: self.options.out
});
} else if (id == 'embedSelection') {
that.triggerEvent('embedselection', {
'in': self.options['in'],
out: self.options.out,
out: self.options.out
});
} else if (id == 'importAnnotations') {
that.triggerEvent('importannotations');
@ -727,7 +727,7 @@ Ox.VideoEditor = function(options, self) {
togglemap: function(data) {
self.options.showAnnotationsMap = !data.collapsed;
that.triggerEvent('togglemap', data);
},
}
});
[
@ -971,7 +971,7 @@ Ox.VideoEditor = function(options, self) {
size.player[0] = {
left: self.margin / 2,
top: self.margin / 2,
width: Math.round((contentWidth - 3 * self.margin + (self.controlsHeight + self.margin) / 2 * self.options.videoRatio) * 2/3),
width: Math.round((contentWidth - 3 * self.margin + (self.controlsHeight + self.margin) / 2 * self.options.videoRatio) * 2/3)
};
size.player[0].height = Math.round(size.player[0].width / self.options.videoRatio);
size.player[1] = {