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

some changes to out point viewer

Browse source
This commit is contained in:
rlx 2011-02-08 00:00:01 +00:00
parent e508313baf
commit 28535be814
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build/js/ox.ui.js
View file

@ -11568,6 +11568,7 @@ requires
duration: 0, duration: 0,
find: '', find: '',
frameURL: function() {}, frameURL: function() {},
fps: 25, // fixme: doesn't get handed through to player
height: 0, height: 0,
largeTimeline: true, largeTimeline: true,
layers: [], layers: [],
@ -12012,7 +12013,7 @@ requires
function selectAnnotation(event, data) { function selectAnnotation(event, data) {
self.options.position = data.in self.options.position = data.in
self.options.points = [data.in, data.out - 0.001]; self.options.points = [data.in, data.out];
setPosition(); setPosition();
setPoints(); setPoints();
} }
@ -12118,6 +12119,7 @@ requires
var self = self || {}, var self = self || {},
that = new Ox.Element('div', self) that = new Ox.Element('div', self)
.defaults({ .defaults({
duration: 0,
find: '', find: '',
height: 0, height: 0,
points: [0, 0], points: [0, 0],
@ -12396,16 +12398,22 @@ requires
} }
function setPosition() { function setPosition() {
var position = Ox.limit(
self.options.position - (self.options.type == 'out' ? 0.01 : 0),
0, self.options.duration - 0.01
),
url;
if (self.options.type == 'play') { if (self.options.type == 'play') {
self.$video.position(self.options.position); self.$video.position(self.options.position);
} else { } else {
self.$loadingIcon && self.$loadingIcon.stop(); self.$loadingIcon && self.$loadingIcon.stop();
if (self.$video.attr('src') != self.options.url(self.options.position)) { url = self.options.url(position);
if (self.$video.attr('src') != url) {
self.$loadingIcon = new Ox.LoadingIcon() self.$loadingIcon = new Ox.LoadingIcon()
.appendTo(that) .appendTo(that)
.start(); .start();
self.$video.attr({ self.$video.attr({
src: self.options.url(self.options.position) src: url
}) })
.load(self.$loadingIcon.stop); .load(self.$loadingIcon.stop);
} }