Browse Source

Fixed #676: misalignment of background items when using subgroups and the group label's height is larger than the contents.

v3_develop
jos 9 years ago
parent
commit
dd7f8048e0
5 changed files with 38 additions and 14 deletions
  1. +2
    -0
      HISTORY.md
  2. +21
    -6
      dist/vis.js
  3. +1
    -1
      dist/vis.map
  4. +4
    -4
      dist/vis.min.js
  5. +10
    -3
      lib/timeline/component/item/BackgroundItem.js

+ 2
- 0
HISTORY.md View File

@ -29,6 +29,8 @@ http://visjs.org
- Fixed #664: end of item not restored when canceling a move event. - Fixed #664: end of item not restored when canceling a move event.
- Fixed #609: reduce the left/right dragarea when an item range is very small, - Fixed #609: reduce the left/right dragarea when an item range is very small,
so you can still move it as a whole. so you can still move it as a whole.
- Fixed #676: misalignment of background items when using subgroups and the
group label's height is larger than the contents.
### DataSet/DataView ### DataSet/DataView

+ 21
- 6
dist/vis.js View File

@ -2309,9 +2309,17 @@ return /******/ (function(modules) { // webpackBootstrap
var filteredItem = {}; var filteredItem = {};
for (var field in item) {
if (item.hasOwnProperty(field) && (fields.indexOf(field) != -1)) {
filteredItem[field] = item[field];
if(Array.isArray(fields)){
for (var field in item) {
if (item.hasOwnProperty(field) && (fields.indexOf(field) != -1)) {
filteredItem[field] = item[field];
}
}
}else{
for (var field in item) {
if (item.hasOwnProperty(field) && fields.hasOwnProperty(field)) {
filteredItem[fields[field]] = item[field];
}
} }
} }
@ -9630,6 +9638,8 @@ return /******/ (function(modules) { // webpackBootstrap
// special positioning for subgroups // special positioning for subgroups
if (this.data.subgroup !== undefined) { if (this.data.subgroup !== undefined) {
// TODO: instead of calculating the top position of the subgroups here for every BackgroundItem, calculate the top of the subgroup once in Itemset
var itemSubgroup = this.data.subgroup; var itemSubgroup = this.data.subgroup;
var subgroups = this.parent.subgroups; var subgroups = this.parent.subgroups;
var subgroupIndex = subgroups[itemSubgroup].index; var subgroupIndex = subgroups[itemSubgroup].index;
@ -9655,15 +9665,20 @@ return /******/ (function(modules) { // webpackBootstrap
// and when the orientation is bottom: // and when the orientation is bottom:
else { else {
var newTop = this.parent.top; var newTop = this.parent.top;
var totalHeight = 0;
for (var subgroup in subgroups) { for (var subgroup in subgroups) {
if (subgroups.hasOwnProperty(subgroup)) { if (subgroups.hasOwnProperty(subgroup)) {
if (subgroups[subgroup].visible == true && subgroups[subgroup].index > subgroupIndex) {
newTop += subgroups[subgroup].height + margin.item.vertical;
if (subgroups[subgroup].visible == true) {
var newHeight = subgroups[subgroup].height + margin.item.vertical;
totalHeight += newHeight;
if (subgroups[subgroup].index > subgroupIndex) {
newTop += newHeight;
}
} }
} }
} }
height = this.parent.subgroups[itemSubgroup].height + margin.item.vertical; height = this.parent.subgroups[itemSubgroup].height + margin.item.vertical;
this.dom.box.style.top = newTop + 'px';
this.dom.box.style.top = (this.parent.height - totalHeight + newTop) + 'px';
this.dom.box.style.bottom = ''; this.dom.box.style.bottom = '';
} }
} }

+ 1
- 1
dist/vis.map
File diff suppressed because it is too large
View File


+ 4
- 4
dist/vis.min.js
File diff suppressed because it is too large
View File


+ 10
- 3
lib/timeline/component/item/BackgroundItem.js View File

@ -147,6 +147,8 @@ BackgroundItem.prototype.repositionY = function(margin) {
// special positioning for subgroups // special positioning for subgroups
if (this.data.subgroup !== undefined) { if (this.data.subgroup !== undefined) {
// TODO: instead of calculating the top position of the subgroups here for every BackgroundItem, calculate the top of the subgroup once in Itemset
var itemSubgroup = this.data.subgroup; var itemSubgroup = this.data.subgroup;
var subgroups = this.parent.subgroups; var subgroups = this.parent.subgroups;
var subgroupIndex = subgroups[itemSubgroup].index; var subgroupIndex = subgroups[itemSubgroup].index;
@ -172,15 +174,20 @@ BackgroundItem.prototype.repositionY = function(margin) {
// and when the orientation is bottom: // and when the orientation is bottom:
else { else {
var newTop = this.parent.top; var newTop = this.parent.top;
var totalHeight = 0;
for (var subgroup in subgroups) { for (var subgroup in subgroups) {
if (subgroups.hasOwnProperty(subgroup)) { if (subgroups.hasOwnProperty(subgroup)) {
if (subgroups[subgroup].visible == true && subgroups[subgroup].index > subgroupIndex) {
newTop += subgroups[subgroup].height + margin.item.vertical;
if (subgroups[subgroup].visible == true) {
var newHeight = subgroups[subgroup].height + margin.item.vertical;
totalHeight += newHeight;
if (subgroups[subgroup].index > subgroupIndex) {
newTop += newHeight;
}
} }
} }
} }
height = this.parent.subgroups[itemSubgroup].height + margin.item.vertical; height = this.parent.subgroups[itemSubgroup].height + margin.item.vertical;
this.dom.box.style.top = newTop + 'px';
this.dom.box.style.top = (this.parent.height - totalHeight + newTop) + 'px';
this.dom.box.style.bottom = ''; this.dom.box.style.bottom = '';
} }
} }

Loading…
Cancel
Save