0x2620/oxjs
2
0
Fork 2
Code Issues 172 Pull requests Releases Wiki Activity

updating video elements (fixes bugs with positions and points)

Browse source
This commit is contained in:
rlx 2011-09-17 07:09:17 +00:00
commit 3f90e96c3a
6 changed files with 44 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -135,7 +135,7 @@ Ox.VideoEditor = function(options, self) {
}
});
$.extend(self, {
Ox.extend(self, {
$player: [],
$timeline: [],
controlsHeight: 16,
@ -659,7 +659,7 @@ Ox.VideoEditor = function(options, self) {
});
}
function changeTimelineLarge(event, data) {
function changeTimelineLarge(data) {
self.options.position = data.position;
self.$player[0].options({
position: data.position
@ -667,9 +667,12 @@ Ox.VideoEditor = function(options, self) {
self.$timeline[1].options({
position: data.position
});
that.triggerEvent('position', {
position: self.options.position
});
}
function changeTimelineSmall(event, data) {
function changeTimelineSmall(data) {
self.options.position = data.position;
self.$player[0].options({
position: data.position
@ -677,6 +680,9 @@ Ox.VideoEditor = function(options, self) {
self.$timeline[0].options({
position: data.position
});
that.triggerEvent('position', {
position: self.options.position
});
}
function find(query) {
@ -906,6 +912,10 @@ Ox.VideoEditor = function(options, self) {
if (self.options['in'] > self.options.out) {
setPoint(point == 'in' ? 'out' : 'in', position);
}
that.triggerEvent('points', {
'in': self.options['in'],
out: self.options.out
});
}
function setPosition(position) {