bridged label object options, fixed bug with self referencing circles

lib/network/Network.js

@@ -175,6 +175,7 @@ Network.prototype.setOptions = function (options) {
 
     // start the physics simulation. Can be safely called multiple times.
     this.body.emitter.emit("startSimulation");
+    this.body.emitter.emit("_requestRedraw");
   }
 };
 

lib/network/modules/ConfigurationSystem.js

@@ -481,7 +481,7 @@ class ConfigurationSystem {
 
     var me = this;
     range.onchange = function () {input.value = this.value; me._update(this.value, path);};
-    range.oninput  = function () {input.value = this.value;};
+    range.oninput  = function () {input.value = this.value; };
 
     let label = this._makeLabel(path[path.length-1], path);
     this._makeEntree(path, label, range, input);

lib/network/modules/NodesHandler.js

@@ -124,6 +124,7 @@ class NodesHandler {
         for (let nodeId in this.body.nodes) {
           if (this.body.nodes.hasOwnProperty(nodeId)) {
             this.body.nodes[nodeId].updateLabelModule();
+            this.body.nodes[nodeId]._reset();
           }
         }
       }

lib/network/modules/components/Edge.js

@@ -48,10 +48,6 @@ class Edge {
     this.labelModule = new Label(this.body, this.options);
 
     this.setOptions(options);
-
-    this.controlNodesEnabled = false;
-    this.controlNodes = {from: undefined, to: undefined, positions: {}};
-    this.connectedNode = undefined;
   }
 
 
@@ -123,7 +119,7 @@ class Edge {
         this.options.color.inherit.enabled = false;
       }
       else {
-        util.extend(this.options.color, options.color);
+        this.options.color = util.bridgeObject(options.color);
         if (options.color.inherit === undefined) {
           this.options.color.inherit.enabled = false;
         }

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

@@ -40,7 +40,7 @@ class EdgeBase {
       }
     }
     else {
-      let [x,y,radius] = this._getCircleData();
+      let [x,y,radius] = this._getCircleData(ctx);
       this._circle(ctx, x, y, radius);
     }
 
@@ -116,7 +116,7 @@ class EdgeBase {
       to = this._findBorderPosition(this.to, ctx);
     }
     else {
-      let [x,y,radius] = this._getCircleData();
+      let [x,y,radius] = this._getCircleData(ctx);
 
       from = this._findBorderPositionCircle(this.from, ctx, {x, y, low:0.25, high:0.6, direction:-1});
       to = this._findBorderPositionCircle(this.from, ctx, {x, y, low:0.6, high:0.8, direction:1});
@@ -124,11 +124,17 @@ class EdgeBase {
     return {from, to};
   }
 
-  _getCircleData() {
+  _getCircleData(ctx) {
     let x, y;
     let node = this.from;
     let radius = this.options.selfReferenceSize;
 
+    if (ctx !== undefined) {
+      if (node.shape.width === undefined) {
+        node.shape.resize(ctx);
+      }
+    }
+
     // get circle coordinates
     if (node.shape.width > node.shape.height) {
       x = node.x + node.shape.width * 0.5;
@@ -435,7 +441,7 @@ class EdgeBase {
     else {
       // draw circle
       let angle, point;
-      let [x,y,radius] = this._getCircleData();
+      let [x,y,radius] = this._getCircleData(ctx);
 
       if (position == 'from') {
         point = this.findBorderPosition(this.from, ctx, {x, y, low:0.25, high:0.6, direction:-1});

lib/network/modules/components/unified/label.js

@@ -37,7 +37,7 @@ class Label {
         this.fontOptions.color = optionsArray[2];
       }
       else if (typeof options.font == 'object') {
-        util.protoExtend(this.fontOptions, options.font);
+        this.fontOptions = util.bridgeObject(options.font);
       }
       this.fontOptions.size = Number(this.fontOptions.size);
     }