From 1cd1540f2824cbedd8f89cc51e67d7edefa24045 Mon Sep 17 00:00:00 2001 From: jos Date: Fri, 13 Jun 2014 12:03:29 +0200 Subject: [PATCH] Fixed a bug in vertical offset when height of container > height of contents --- src/timeline/Timeline.js | 3 +++ test/timeline_groups.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/timeline/Timeline.js b/src/timeline/Timeline.js index 719ebd6d..ca24de0b 100644 --- a/src/timeline/Timeline.js +++ b/src/timeline/Timeline.js @@ -595,6 +595,9 @@ Timeline.prototype.redraw = function() { // reposition the scrollable contents var offset = this.props.scrollTop; + if (options.orientation == 'bottom') { + offset += Math.max(this.props.centerContainer.height - this.props.center.height, 0); + } dom.center.style.left = '0'; dom.center.style.top = offset + 'px'; dom.left.style.left = '0'; diff --git a/test/timeline_groups.html b/test/timeline_groups.html index 1fd57844..de2f5b16 100644 --- a/test/timeline_groups.html +++ b/test/timeline_groups.html @@ -80,7 +80,7 @@ updateGroup: true }, //stack: false, - height: 200, + //height: 200, groupOrder: 'content' };