fixed dynamic edges not correctly handling non-existent nodes.

9 years ago · 547fb05176
--- a/dist/vis.js
+++ b/dist/vis.js
--- a/lib/network/modules/components/Edge.js
+++ b/lib/network/modules/components/Edge.js
@ -73,9 +73,6 @@ class Edge {
    if (options.value !== undefined)  {options.value = parseInt(options.value);}


    // A node is connected when it has a from and to node that both exist in the network.body.nodes.
    this.connect();

    // update label Module
    this.updateLabelModule();

@ -84,6 +81,9 @@ class Edge {
    // if anything has been updates, reset the selection width and the hover width
    this._setInteractionWidths();

    // A node is connected when it has a from and to node that both exist in the network.body.nodes.
    this.connect();

    return dataChanged;
  }

@ -267,6 +267,8 @@ class Edge {
        this.to.detachEdge(this);
      }
    }

    this.edgeType.connect();
  }


--- a/lib/network/modules/components/edges/BezierEdgeDynamic.js
+++ b/lib/network/modules/components/edges/BezierEdgeDynamic.js
@ -8,17 +8,25 @@ class BezierEdgeDynamic extends BezierEdgeBase {

  setOptions(options) {
    this.options = options;
    this.from = this.body.nodes[this.options.from];
    this.to = this.body.nodes[this.options.to];
    this.id = this.options.id;
    this.setupSupportNode();
    this.connect();
  }

    // fix weird behaviour
    if (this.from.id === this.to.id) {
  connect() {
    this.from = this.body.nodes[this.options.from];
    this.to = this.body.nodes[this.options.to];
    if (this.from === undefined || this.to === undefined) {
      this.via.setOptions({physics:false})
    }
    else {
      this.via.setOptions({physics:true})
      // fix weird behaviour where a selfreferencing node has physics enabled
      if (this.from.id === this.to.id) {
        this.via.setOptions({physics: false})
      }
      else {
        this.via.setOptions({physics: true})
      }
    }
  }

--- a/lib/network/modules/components/edges/BezierEdgeStatic.js
+++ b/lib/network/modules/components/edges/BezierEdgeStatic.js
@ -5,9 +5,6 @@ class BezierEdgeStatic extends BezierEdgeBase {
    super(options, body, labelModule);
  }

  cleanup() {
    return false;
  }
  /**
   * Draw a line between two nodes
   * @param {CanvasRenderingContext2D} ctx
--- a/lib/network/modules/components/edges/StraightEdge.js
+++ b/lib/network/modules/components/edges/StraightEdge.js
@ -5,9 +5,6 @@ class StraightEdge extends EdgeBase {
    super(options, body, labelModule);
  }

  cleanup() {
    return false;
  }
  /**
   * Draw a line between two nodes
   * @param {CanvasRenderingContext2D} ctx
--- a/lib/network/modules/components/edges/util/EdgeBase.js
+++ b/lib/network/modules/components/edges/util/EdgeBase.js
@ -11,6 +11,9 @@ class EdgeBase {
    this.hoverWidth = 1.5;
  }

  connect() {}
  cleanup() {return false}

  setOptions(options) {
    this.options = options;
    this.from = this.body.nodes[this.options.from];
--- a/test/networkTest.html
+++ b/test/networkTest.html
@ -3,8 +3,8 @@
 <head>
    <title>Network | Basic usage</title>

    <script type="text/javascript" src="http://www.visjs.org/dist/vis.js"></script>
    <link href="http://www.visjs.org/dist/vis.css" rel="stylesheet" type="text/css" />
    <script type="text/javascript" src="../dist/vis.js"></script>
    <link href="../dist/vis.css" rel="stylesheet" type="text/css" />

    <style type="text/css">
        #div_graph {
@ -13,7 +13,10 @@
            border: 1px solid lightgray;
        }
    </style>
    <script type="text/javascript">
    </script>
 </head>

 <body>

 <p>
@ -67,7 +70,7 @@
        edges: edges
    };

    var network = new vis.Network(container, data, options);
    network = new vis.Network(container, data, options);
 //    nodesView.refresh();