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

make sure timeline player has a bottom margin of 8px (not 4px)

Browse source
This commit is contained in:
rlx 2012-04-19 07:00:04 +00:00
parent 14102508e1
commit 821e8d1a4e
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -144,7 +144,6 @@ Ox.VideoTimelinePlayer = function(options, self) {
self.options.position -= self.contentWidth / self.fps; self.options.position -= self.contentWidth / self.fps;
setPosition(); setPosition();
} }
}); });
self.$playerbar = Ox.Bar({size: 16}); self.$playerbar = Ox.Bar({size: 16});
@ -243,6 +242,9 @@ Ox.VideoTimelinePlayer = function(options, self) {
Ox.loop(self.lines, function(i) { Ox.loop(self.lines, function(i) {
addLine(i); addLine(i);
}); });
Ox.last(self.$lines).css({
height: self.tileHeight + 1.5 * self.margin + 'px'
});
self.$frameBox = $('<div>') self.$frameBox = $('<div>')
.css({ .css({
@ -362,7 +364,6 @@ Ox.VideoTimelinePlayer = function(options, self) {
self.$lines[i] self.$lines[i]
.append(self.$timelines[i][1]) .append(self.$timelines[i][1])
.append(self.$timelines[i][0]); .append(self.$timelines[i][0]);
} }
function changeVolume(num) { function changeVolume(num) {
@ -668,6 +669,9 @@ Ox.VideoTimelinePlayer = function(options, self) {
self.$lines.pop(); self.$lines.pop();
self.$timelines.pop(); self.$timelines.pop();
} }
Ox.last(self.$lines).css({
height: self.tileHeight + 1.5 * self.margin + 'px'
});
if (!self.options.paused && self.options.followPlayer) { if (!self.options.paused && self.options.followPlayer) {
self.scrollTimeout && clearTimeout(self.scrollTimeout); self.scrollTimeout && clearTimeout(self.scrollTimeout);
scrollToPosition(); scrollToPosition();