From 821e8d1a4e232c392cb8264f1a9d2d9644d4678e Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Thu, 19 Apr 2012 07:00:04 +0000 Subject: [PATCH] make sure timeline player has a bottom margin of 8px (not 4px) --- source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js b/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js index 6fb08949..58634735 100644 --- a/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js @@ -144,7 +144,6 @@ Ox.VideoTimelinePlayer = function(options, self) { self.options.position -= self.contentWidth / self.fps; setPosition(); } - }); self.$playerbar = Ox.Bar({size: 16}); @@ -243,6 +242,9 @@ Ox.VideoTimelinePlayer = function(options, self) { Ox.loop(self.lines, function(i) { addLine(i); }); + Ox.last(self.$lines).css({ + height: self.tileHeight + 1.5 * self.margin + 'px' + }); self.$frameBox = $('
') .css({ @@ -362,7 +364,6 @@ Ox.VideoTimelinePlayer = function(options, self) { self.$lines[i] .append(self.$timelines[i][1]) .append(self.$timelines[i][0]); - } function changeVolume(num) { @@ -668,6 +669,9 @@ Ox.VideoTimelinePlayer = function(options, self) { self.$lines.pop(); self.$timelines.pop(); } + Ox.last(self.$lines).css({ + height: self.tileHeight + 1.5 * self.margin + 'px' + }); if (!self.options.paused && self.options.followPlayer) { self.scrollTimeout && clearTimeout(self.scrollTimeout); scrollToPosition();