Browse Source

Merge branch 'develop' of https://github.com/almende/vis into develop

Conflicts:
	HISTORY.md
	dist/vis.js
v3_develop
Alex de Mulder 10 years ago
parent
commit
9fdcac2f65
5 changed files with 24903 additions and 23439 deletions
  1. +5
    -0
      HISTORY.md
  2. +24883
    -23424
      dist/vis.js
  3. +1
    -1
      dist/vis.map
  4. +13
    -13
      dist/vis.min.js
  5. +1
    -1
      lib/timeline/component/Group.js

+ 5
- 0
HISTORY.md View File

@ -12,6 +12,11 @@ http://visjs.org
- Added visible property to the groups.
- Added getLegend() method.
### Timeline
- Fixed items in groups sometimes being displayed but not positioned correctly.
## 2014-07-22, version 3.1.0

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


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


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


+ 1
- 1
lib/timeline/component/Group.js View File

@ -258,7 +258,7 @@ Group.prototype.add = function(item) {
this.items[item.id] = item;
item.setParent(this);
if (item instanceof ItemRange && this.visibleItems.indexOf(item) == -1) {
if (this.visibleItems.indexOf(item) == -1) {
var range = this.itemSet.body.range; // TODO: not nice accessing the range like this
this._checkIfVisible(item, this.visibleItems, range);
}

Loading…
Cancel
Save