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

2
source/Ox.UI/js/Video/Ox.AnnotationPanel.js
View file

@ -139,7 +139,7 @@ Ox.AnnotationPanel = function(options, self) {
that.triggerEvent('toggle' + (
layer.type == 'event' ? 'calendar' : 'map'
), data);
},
}
})
.appendTo(self.$folders);
[

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

@ -27,7 +27,7 @@ Ox.BlockVideoTimeline = function(options, self) {
.options(options || {})
.addClass('OxBlockVideoTimeline')
.css({
position: 'absolute',
position: 'absolute'
})
.bind({
mousedown: mousedown,
@ -120,7 +120,7 @@ Ox.BlockVideoTimeline = function(options, self) {
top: '2px',
width: Math.round(self.options.duration) + 'px',
height: '20px',
marginLeft: -i * self.options.width + 'px',
marginLeft: -i * self.options.width + 'px'
//background: 'rgba(255, 0, 0, 0.1)',
})
.appendTo(self.$lines[i]);

2
source/Ox.UI/js/Video/Ox.LargeVideoTimeline.js
View file

@ -133,7 +133,7 @@ Ox.LargeVideoTimeline = function(options, self) {
function setMarker() {
self.$markerPosition.css({
left: self.center + 'px',
left: self.center + 'px'
});
}

2
source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js
View file

@ -58,7 +58,7 @@ Ox.SmallVideoTimeline = function(options, self) {
left: self.interfaceLeft + 'px',
top: self.interfaceTop + 'px',
width: self.interfaceWidth + 'px',
height: '20px',
height: '20px'
})
.bindEvent({
drag: function(data) {

2
source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js
View file

@ -20,7 +20,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
state: 'default',
subtitles: [],
type: '',
width: 256,
width: 256
})
.options(options || {})
.css({

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] = {

2
source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js
View file

@ -185,7 +185,7 @@ Ox.VideoEditorPlayer = function(options, self) {
value: Ox.formatDuration(self.options.position, 3)
})
.css({
float: 'right',
float: 'right'
})
.appendTo(self.$controls)

16
source/Ox.UI/js/Video/Ox.VideoPlayer.js
View file

@ -292,7 +292,7 @@ Ox.VideoPlayer = function(options, self) {
self.$videoContainer = Ox.Element()
.addClass('OxVideoContainer')
.css({
top: self.options.externalControls && self.options.controlsTop.length ? '16px' : 0,
top: self.options.externalControls && self.options.controlsTop.length ? '16px' : 0
})
.appendTo(that.$element)
@ -315,7 +315,7 @@ Ox.VideoPlayer = function(options, self) {
// and poster doesn't seem to work at all
Ox.extend({
preload: self.options.preload,
src: self.video,
src: self.video
}, !self.options.paused && !self.options.playInToOut ? {
/*autoplay: 'autoplay'*/
} : {}/*, self.options.poster ? {
@ -443,7 +443,7 @@ Ox.VideoPlayer = function(options, self) {
})
.addClass('OxCensoredIcon OxVideo')
.attr({
src: Ox.UI.getImageURL('symbol' + self.options.censoredIcon, 'modern'),
src: Ox.UI.getImageURL('symbol' + self.options.censoredIcon, 'modern')
})
.hide()
.bindEvent({
@ -668,7 +668,7 @@ Ox.VideoPlayer = function(options, self) {
})
.addClass('OxPosition')
.css({
width: self.positionWidth - 4 + 'px',
width: self.positionWidth - 4 + 'px'
})
.html(formatPosition())
.bind({
@ -1256,7 +1256,7 @@ Ox.VideoPlayer = function(options, self) {
css = {
left: logoMargin + 'px',
top: logoMargin + (self.controlsTopAreVisible ? 16 : 0) + 'px',
height: logoHeight + 'px',
height: logoHeight + 'px'
};
} else if (element == 'player') {
var height = self.options.fullscreen ? window.innerHeight : self.height;
@ -1590,7 +1590,7 @@ Ox.VideoPlayer = function(options, self) {
self.$logo.unbind('mouseenter').unbind('mouseleave');
});
self.$subtitle && self.$subtitle.animate({
bottom: getCSS('subtitle').bottom,
bottom: getCSS('subtitle').bottom
}, 250);
}
}, self.options.fullscreen ? 2500 : 1000);
@ -2007,7 +2007,7 @@ Ox.VideoPlayer = function(options, self) {
width: width
});
self.$findInput.children('input').css({
width: (width - 12) + 'px',
width: (width - 12) + 'px'
});
});
setSize(self.$volume, getCSS('volume'), animate, function() {
@ -2110,7 +2110,7 @@ Ox.VideoPlayer = function(options, self) {
});
});
self.$subtitle && self.$subtitle.animate({
bottom: getCSS('subtitle').bottom,
bottom: getCSS('subtitle').bottom
}, 250);
}
}

12
source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js
View file

@ -203,7 +203,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
self.$position = Ox.Element()
.addClass('OxPosition')
.css({
width: self.positionWidth - 4 + 'px',
width: self.positionWidth - 4 + 'px'
})
.html(formatPosition())
.bind({
@ -309,7 +309,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
left: 0,
top: 0,
width: self.videoWidth + 'px',
height: self.tileHeight + 'px',
height: self.tileHeight + 'px'
})
.appendTo(self.$frameBox);
@ -361,7 +361,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
left: 0,
top: 0,
width: self.videoWidth + 'px',
height: self.tileHeight + 'px',
height: self.tileHeight + 'px'
})
.appendTo(self.$videoBox);
@ -391,11 +391,11 @@ Ox.VideoTimelinePlayer = function(options, self) {
self.$timeline.clone()
.css({
width: self.frame + self.videoWidth + 'px',
marginLeft: -i * self.contentWidth + 'px',
marginLeft: -i * self.contentWidth + 'px'
}),
self.$timeline.clone()
.css({
marginLeft: -i * self.contentWidth + self.videoWidth - 1 + 'px',
marginLeft: -i * self.contentWidth + self.videoWidth - 1 + 'px'
})
];
self.$lines[i]
@ -591,7 +591,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
left: 0,
top: self.margin / 2 + 'px',
width: self.frames + 'px',
height: self.tileHeight + 'px',
height: self.tileHeight + 'px'
//background: 'rgba(255, 0, 0, 0.5)'
})
.appendTo($timeline);