Merge remote-tracking branch 'origin/develop' into develop

HISTORY.md

@@ -22,6 +22,8 @@ http://visjs.org
 - Fixed #861, brokenImage only working for one node if nodes have the same image.
 - Fixed hoverNode and blurNode events and added them to the docs.
 - Fixed #884, selectNode event.
+- Fixed dynamic setting hidden and physics.
+- Fixed edit node mode's fallback.
 
 ### Graph2d & Timeline
 

examples/network/other/manipulation.html

@@ -98,7 +98,7 @@
             document.getElementById('node-id').value = data.id;
             document.getElementById('node-label').value = data.label;
             document.getElementById('saveButton').onclick = saveData.bind(this, data, callback);
-            document.getElementById('cancelButton').onclick = clearPopUp.bind();
+            document.getElementById('cancelButton').onclick = cancelEdit.bind(this,callback);
             document.getElementById('network-popUp').style.display = 'block';
           },
           addEdge: function (data, callback) {
@@ -123,6 +123,11 @@
       document.getElementById('network-popUp').style.display = 'none';
     }
 
+    function cancelEdit(callback) {
+      clearPopUp();
+      callback(null);
+    }
+
     function saveData(data,callback) {
       data.id = document.getElementById('node-id').value;
       data.label = document.getElementById('node-label').value;

lib/network/modules/ManipulationSystem.js

@@ -274,8 +274,8 @@ class ManipulationSystem {
           this.options.editNode(data, (finalizedData) => {
             if (finalizedData !== null && finalizedData !== undefined && this.inMode === 'editNode') { // if for whatever reason the mode has changes (due to dataset change) disregard the callback) {
               this.body.data.nodes.update(finalizedData);
-              this.showManipulatorToolbar();
             }
+            this.showManipulatorToolbar();
           });
         }
         else {

lib/network/modules/NodesHandler.js

@@ -242,7 +242,7 @@ class NodesHandler {
       let data = changedData[i];
       if (node !== undefined) {
         // update node
-        node.setOptions(data);
+        dataChanged = node.setOptions(data);
       }
       else {
         dataChanged = true;
@@ -411,7 +411,6 @@ class NodesHandler {
     else {
       console.log("NodeId provided for getConnectedEdges does not exist. Provided: ", nodeId)
     }
-    console.log(edgeList)
     return edgeList;
   }
 

lib/network/modules/components/Edge.js

@@ -84,6 +84,10 @@ class Edge {
     // A node is connected when it has a from and to node that both exist in the network.body.nodes.
     this.connect();
 
+    if (options.hidden !== undefined || options.physics !== undefined) {
+      dataChanged = true;
+    }
+
     return dataChanged;
   }
 

lib/network/modules/components/Node.js

@@ -152,6 +152,11 @@ class Node {
 
     // reset the size of the node, this can be changed
     this._reset();
+
+    if (options.hidden !== undefined || options.physics !== undefined) {
+      return true;
+    }
+    return false;
   }
 
 

lib/network/modules/components/physics/BarnesHutSolver.js

@@ -102,7 +102,7 @@ class BarnesHutSolver {
    */
   _calculateForces(distance, dx, dy, node, parentBranch) {
     if (distance === 0) {
-      distance = 0.1 * Math.random();
+      distance = 0.1;
       dx = distance;
     }
 
@@ -282,8 +282,10 @@ class BarnesHutSolver {
               // we move one node a pixel and we do not put it in the tree.
         if (parentBranch.children[region].children.data.x === node.x &&
           parentBranch.children[region].children.data.y === node.y) {
-          node.x += Math.random();
-          node.y += Math.random();
+          //node.x += Math.random();
+          //node.y += Math.random();
+          node.x += 0.1;
+          node.y += 0.1;
         }
         else {
           this._splitBranch(parentBranch.children[region]);