Browse Source

Fixed #408: height of background items not 100% when having a fixed or max height defined.

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

+ 4
- 0
HISTORY.md View File

@ -4,6 +4,10 @@ http://visjs.org
## not yet released, version 3.6.4
### Timeline
- Fixed height of background items when having a fixed or max height defined.
## 2014-10-28, version 3.6.3

+ 4
- 2
dist/vis.js View File

@ -5,7 +5,7 @@
* A dynamic, browser-based visualization library.
*
* @version 3.6.4-SNAPSHOT
* @date 2014-10-28
* @date 2014-11-03
*
* @license
* Copyright (C) 2011-2014 Almende B.V, http://almende.com
@ -14552,7 +14552,9 @@ return /******/ (function(modules) { // webpackBootstrap
// we want backgrounds with groups to only show in groups.
if (this.parent instanceof BackgroundGroup) {
// if the item is not in a group:
height = Math.max(this.parent.height, this.parent.itemSet.body.domProps.centerContainer.height);
height = Math.max(this.parent.height,
this.parent.itemSet.body.domProps.center.height,
this.parent.itemSet.body.domProps.centerContainer.height);
this.dom.box.style.top = onTop ? '0' : '';
this.dom.box.style.bottom = onTop ? '' : '0';
}

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


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


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

@ -188,7 +188,9 @@ BackgroundItem.prototype.repositionY = function(margin) {
// we want backgrounds with groups to only show in groups.
if (this.parent instanceof BackgroundGroup) {
// if the item is not in a group:
height = Math.max(this.parent.height, this.parent.itemSet.body.domProps.centerContainer.height);
height = Math.max(this.parent.height,
this.parent.itemSet.body.domProps.center.height,
this.parent.itemSet.body.domProps.centerContainer.height);
this.dom.box.style.top = onTop ? '0' : '';
this.dom.box.style.bottom = onTop ? '' : '0';
}

Loading…
Cancel
Save