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

cleanup, again

Browse source
This commit is contained in:
rolux 2011-11-03 16:42:41 +01:00
commit 094b1a59ec
34 changed files with 93 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -172,7 +172,6 @@ Ox.BlockVideoTimeline = function(options, self) {
Ox.formatDuration(position)
})
.show(e.clientX, e.clientY);
} else {
self.$tooltip.hide();
}

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

@ -97,8 +97,7 @@ Ox.SmallVideoTimeline = function(options, self) {
}
function getPosition(e) {
var position =
(
var position = (
(e.offsetX ? e.offsetX : e.clientX - $(e.target).offset().left) -
(self.options.type == 'player' ? 8 : 0)
) * self.options.duration / self.imageWidth;

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

@ -275,7 +275,7 @@ Ox.VideoEditor = function(options, self) {
)
.bindEvent({
add: function(data) {
data.layer = layer.id;
data.layer = layer.id;
data['in'] = self.options['in'];
data.out = self.options.out;
that.triggerEvent('addannotation', data);
@ -440,7 +440,7 @@ Ox.VideoEditor = function(options, self) {
}
});
//.appendTo(self.$videobar);
if (self.options.posterFrameControls) {
self.$goToPosterButton = Ox.Button({
@ -598,7 +598,6 @@ Ox.VideoEditor = function(options, self) {
{id: 'smallText', title: 'Small', checked: true},
{id: 'mediumText', title: 'Medium'},
{id: 'largeText', title: 'Large'}
],
max: 2,
title: 'set',
@ -772,9 +771,9 @@ Ox.VideoEditor = function(options, self) {
function getSizes(scrollbarIsVisible) {
//Ox.print('getSizes', scrollbarIsVisible)
var scrollbarWidth = Ox.UI.SCROLLBAR_SIZE,
contentWidth = self.options.width -
(self.options.showAnnotations * self.options.annotationsSize) - 1 -
(scrollbarIsVisible ? scrollbarWidth : 0),
contentWidth = self.options.width
- (self.options.showAnnotations * self.options.annotationsSize) - 1
- (scrollbarIsVisible ? scrollbarWidth : 0),
height,
lines,
size = {
@ -1008,7 +1007,7 @@ Ox.VideoEditor = function(options, self) {
self.$player[0].togglePaused();
/* fixme
self.$player[0].options('paused') && that.triggerEvent('position', {
});
*/
}

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

@ -238,7 +238,7 @@ Ox.VideoPanelPlayer = function(options, self) {
//self.$video.position(self.options.position);
self.$timeline.options({
position: self.options.position
});
});
}
function toggleAnnotations(data) {
@ -291,7 +291,7 @@ Ox.VideoPanelPlayer = function(options, self) {
/*@
toggleAnnotations <f> toggle annotations
() -> <o> toggle visibility of annotations
() -> <o> toggle visibility of annotations
@*/
that.toggleAnnotations = function() {
that.$element.toggle(1);