Browse Source

- Fixed #1408: Unclustering without release function respects fixed positions now.

fixDataView
Alex de Mulder 9 years ago
parent
commit
ffa3be85db
4 changed files with 1627 additions and 29 deletions
  1. +1
    -0
      HISTORY.md
  2. +6
    -2
      dist/vis.js
  3. +2
    -2
      lib/network/modules/Clustering.js
  4. +1618
    -25
      test/networkTest.html

+ 1
- 0
HISTORY.md View File

@ -18,6 +18,7 @@ http://visjs.org
- Fixed #1324: Labels now scale again. - Fixed #1324: Labels now scale again.
- Fixed #1362: Layout of hierarchicaly systems no longer overlaps NODES. - Fixed #1362: Layout of hierarchicaly systems no longer overlaps NODES.
- Fixed #1414: Fixed color references for nodes and edges. - Fixed #1414: Fixed color references for nodes and edges.
- Fixed #1408: Unclustering without release function respects fixed positions now.
### Timeline ### Timeline

+ 6
- 2
dist/vis.js View File

@ -35765,8 +35765,12 @@ return /******/ (function(modules) { // webpackBootstrap
var containedNode = this.body.nodes[nodeId]; var containedNode = this.body.nodes[nodeId];
containedNode = containedNodes[nodeId]; containedNode = containedNodes[nodeId];
// inherit position // inherit position
containedNode.x = clusterNode.x;
containedNode.y = clusterNode.y;
if (containedNode.options.fixed.x === false) {
containedNode.x = clusterNode.x;
}
if (containedNode.options.fixed.y === false) {
containedNode.y = clusterNode.y;
}
} }
} }
} }

+ 2
- 2
lib/network/modules/Clustering.js View File

@ -567,8 +567,8 @@ class ClusterEngine {
let containedNode = this.body.nodes[nodeId]; let containedNode = this.body.nodes[nodeId];
containedNode = containedNodes[nodeId]; containedNode = containedNodes[nodeId];
// inherit position // inherit position
containedNode.x = clusterNode.x;
containedNode.y = clusterNode.y;
if (containedNode.options.fixed.x === false) {containedNode.x = clusterNode.x;}
if (containedNode.options.fixed.y === false) {containedNode.y = clusterNode.y;}
} }
} }
} }

+ 1618
- 25
test/networkTest.html
File diff suppressed because it is too large
View File


Loading…
Cancel
Save