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

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);
}
}