- Fixed #974 connecting static smooth and straight edges. also bug introduced in the layout

HISTORY.md

@@ -17,6 +17,8 @@ http://visjs.org
 - Fixed delete callbacks with null argument not showing toolbar afterwards.
 - Added zoom events from keyboard and navigation buttons.
 - No longer start stabilization with an empty node set.
+- Fixed #974 connecting static smooth and straight edges.
+
 
 ## 2015-06-16, version 4.3.0
 

lib/network/modules/LayoutEngine.js

@@ -149,10 +149,10 @@ class LayoutEngine {
         let node = nodesArray[i];
         let radius = 10 * 0.1 * nodesArray.length + 10;
         let angle = 2 * Math.PI * this.seededRandom();
-        if (node.options.fixed.x === false || node.x === undefined) {
+        if (node.x === undefined) {
           node.x = radius * Math.cos(angle);
         }
-        if (node.options.fixed.x === false || node.y === undefined) {
+        if (node.y === undefined) {
           node.y = radius * Math.sin(angle);
         }
       }

lib/network/modules/components/edges/BezierEdgeDynamic.js

@@ -16,7 +16,7 @@ class BezierEdgeDynamic extends BezierEdgeBase {
   connect() {
     this.from = this.body.nodes[this.options.from];
     this.to = this.body.nodes[this.options.to];
-    if (this.from === undefined || this.to === undefined) {
+    if (this.from === undefined || this.to === undefined || this.options.physics === false) {
       this.via.setOptions({physics:false})
     }
     else {

lib/network/modules/components/edges/util/EdgeBase.js

@@ -11,7 +11,10 @@ class EdgeBase {
     this.hoverWidth = 1.5;
   }
 
-  connect() {}
+  connect() {
+    this.from = this.body.nodes[this.options.from];
+    this.to = this.body.nodes[this.options.to];
+  }
   cleanup() {return false}
 
   setOptions(options) {