Browse Source

Fixed a bug in vertical offset when height of container > height of contents

css_transitions
jos 10 years ago
parent
commit
1cd1540f28
2 changed files with 4 additions and 1 deletions
  1. +3
    -0
      src/timeline/Timeline.js
  2. +1
    -1
      test/timeline_groups.html

+ 3
- 0
src/timeline/Timeline.js View File

@ -595,6 +595,9 @@ Timeline.prototype.redraw = function() {
// reposition the scrollable contents // reposition the scrollable contents
var offset = this.props.scrollTop; 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.left = '0';
dom.center.style.top = offset + 'px'; dom.center.style.top = offset + 'px';
dom.left.style.left = '0'; dom.left.style.left = '0';

+ 1
- 1
test/timeline_groups.html View File

@ -80,7 +80,7 @@
updateGroup: true updateGroup: true
}, },
//stack: false, //stack: false,
height: 200,
//height: 200,
groupOrder: 'content' groupOrder: 'content'
}; };

Loading…
Cancel
Save