Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Jul 29, 2019. It is now read-only.

Fix background items positioning when orientation: top #2831

Merged
merged 21 commits into from
Mar 5, 2017
Merged

Fix background items positioning when orientation: top #2831

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dcb2d58
Fix redraw order
yotamberk Dec 2, 2016
582fc64
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Dec 6, 2016
f96e6bf
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Dec 8, 2016
ffa8e0e
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Dec 17, 2016
2f04345
Fix error when option is not defined
yotamberk Dec 20, 2016
3cfa8d0
Allow template labels
yotamberk Dec 22, 2016
aee0fb3
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Dec 22, 2016
4681ace
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Dec 23, 2016
e9d1ebf
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Dec 31, 2016
cd37b2d
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Dec 31, 2016
9a27aa7
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Jan 5, 2017
4982679
Add .travis.yml file
yotamberk Jan 5, 2017
b9144d3
Add experiment travis code
yotamberk Jan 5, 2017
001fd9f
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Jan 15, 2017
e504dc7
Merge branch 'develop' of https://github.com/yotamberk/vis into develop
yotamberk Jan 15, 2017
ada1c90
Fix react example
yotamberk Jan 15, 2017
3124d8e
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Jan 27, 2017
4870ad2
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Feb 11, 2017
fae21a0
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Feb 15, 2017
91c2c31
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Mar 4, 2017
419005b
Fix background items when orientation top
yotamberk Mar 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/timeline/component/item/BackgroundItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ BackgroundItem.prototype.repositionX = RangeItem.prototype.repositionX;
*/
BackgroundItem.prototype.repositionY = function(margin) {
var height;
var orientation = this.options.orientation.item;

// special positioning for subgroups
if (this.data.subgroup !== undefined) {
Expand All @@ -154,7 +155,6 @@ BackgroundItem.prototype.repositionY = function(margin) {

this.dom.box.style.height = this.parent.subgroups[itemSubgroup].height + 'px';

var orientation = this.options.orientation.item;
if (orientation == 'top') {
this.dom.box.style.top = this.parent.top + this.parent.subgroups[itemSubgroup].top + 'px';
} else {
Expand All @@ -170,8 +170,8 @@ BackgroundItem.prototype.repositionY = function(margin) {
height = Math.max(this.parent.height,
this.parent.itemSet.body.domProps.center.height,
this.parent.itemSet.body.domProps.centerContainer.height);
this.dom.box.style.bottom = orientation == 'bottom' ? '0' : '';
this.dom.box.style.top = orientation == 'top' ? '0' : '';
this.dom.box.style.bottom = orientation == 'top' ? '' : '0';
}
else {
height = this.parent.height;
Expand Down