From f5fce4efc8cc113c6dbc9d08ef77bb51ceeb5acb Mon Sep 17 00:00:00 2001
From: Alex de Mulder <alexdemulder@gmail.com>
Date: Wed, 14 Jan 2015 14:49:58 +0100
Subject: [PATCH] cleaned up hierarchical code

---
 dist/vis.js                                   | 44 +++++++++----------
 .../network/32_hierarchicaLayoutMethods.html  |  9 +---
 lib/network/Network.js                        |  2 +-
 lib/network/mixins/HierarchicalLayoutMixin.js | 42 +++++++++---------
 4 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/dist/vis.js b/dist/vis.js
index f759647e..29dd007e 100644
--- a/dist/vis.js
+++ b/dist/vis.js
@@ -22873,7 +22873,7 @@ return /******/ (function(modules) { // webpackBootstrap
         levelSeparation: 150,
         nodeSpacing: 100,
         direction: "UD",   // UD, DU, LR, RL
-        layout: "hubsize" // hubsize, directed, uniqueDirected
+        layout: "hubsize" // hubsize, directed
       },
       freezeForStabilization: false,
       smoothCurves: {
@@ -33903,23 +33903,6 @@ return /******/ (function(modules) { // webpackBootstrap
    */
   exports._setupHierarchicalLayout = function() {
     if (this.constants.hierarchicalLayout.enabled == true && this.nodeIndices.length > 0) {
-      if (this.constants.hierarchicalLayout.direction == "RL" || this.constants.hierarchicalLayout.direction == "DU") {
-        this.constants.hierarchicalLayout.levelSeparation = this.constants.hierarchicalLayout.levelSeparation < 0 ? this.constants.hierarchicalLayout.levelSeparation : this.constants.hierarchicalLayout.levelSeparation * -1;
-      }
-      else {
-        this.constants.hierarchicalLayout.levelSeparation = Math.abs(this.constants.hierarchicalLayout.levelSeparation);
-      }
-
-      if (this.constants.hierarchicalLayout.direction == "RL" || this.constants.hierarchicalLayout.direction == "LR") {
-        if (this.constants.smoothCurves.enabled == true) {
-          this.constants.smoothCurves.type = "vertical";
-        }
-      }
-      else {
-        if (this.constants.smoothCurves.enabled == true) {
-          this.constants.smoothCurves.type = "horizontal";
-        }
-      }
       // get the size of the largest hubs and check if the user has defined a level for a node.
       var hubsize = 0;
       var node, nodeId;
@@ -33959,7 +33942,7 @@ return /******/ (function(modules) { // webpackBootstrap
             this._determineLevels(hubsize);
           }
           else {
-            this._determineLevelsDirected();
+            this._determineLevelsDirected(false);
           }
 
         }
@@ -34156,6 +34139,23 @@ return /******/ (function(modules) { // webpackBootstrap
       this.constants.smoothCurves.dynamic = false;
     }
     this._configureSmoothCurves();
+
+    var config = this.constants.hierarchicalLayout;
+    config.levelSeparation = Math.abs(config.levelSeparation);
+    if (config.direction == "RL" || config.direction == "DU") {
+      config.levelSeparation *= -1;
+    }
+
+    if (config.direction == "RL" || config.direction == "LR") {
+      if (this.constants.smoothCurves.enabled == true) {
+        this.constants.smoothCurves.type = "vertical";
+      }
+    }
+    else {
+      if (this.constants.smoothCurves.enabled == true) {
+        this.constants.smoothCurves.type = "horizontal";
+      }
+    }
   };
 
 
@@ -34243,9 +34243,9 @@ return /******/ (function(modules) { // webpackBootstrap
    */
   exports._setLevelDirected = function(level, edges, parentId) {
     this.nodes[parentId].hierarchyEnumerated = true;
+    var childNode, direction;
     for (var i = 0; i < edges.length; i++) {
-      var childNode = null;
-      var direction = 1;
+      direction = 1;
       if (edges[i].toId == parentId) {
         childNode = edges[i].from;
         direction = -1;
@@ -34259,9 +34259,9 @@ return /******/ (function(modules) { // webpackBootstrap
     }
 
     for (var i = 0; i < edges.length; i++) {
-      var childNode = null;
       if (edges[i].toId == parentId) {childNode = edges[i].from;}
       else {childNode = edges[i].to;}
+
       if (childNode.edges.length > 1 && childNode.hierarchyEnumerated === false) {
         this._setLevelDirected(childNode.level, childNode.edges, childNode.id);
       }
diff --git a/examples/network/32_hierarchicaLayoutMethods.html b/examples/network/32_hierarchicaLayoutMethods.html
index 7cdf485c..3b9901a0 100644
--- a/examples/network/32_hierarchicaLayoutMethods.html
+++ b/examples/network/32_hierarchicaLayoutMethods.html
@@ -19,7 +19,7 @@
 
     <script type="text/javascript">
         var network = null;
-        var layoutMethod = "direction";
+        var layoutMethod = "hubsize";
 
         function destroy() {
             if (network !== null) {
@@ -83,10 +83,6 @@
                 from: 2,
                 to: 8
             });
-            edges.push({
-                from: 10,
-                to: 2
-            });
             edges.push({
                 from: 2,
                 to: 9
@@ -134,9 +130,8 @@
 </div>
 Layout method:
 <select id="layout">
-    <option value="direction">direction</option>
     <option value="hubsize">hubsize</option>
-
+    <option value="direction">direction</option>
 </select><br/>
 <br />
 
diff --git a/lib/network/Network.js b/lib/network/Network.js
index 58e2cf6c..94b6a5ee 100644
--- a/lib/network/Network.js
+++ b/lib/network/Network.js
@@ -181,7 +181,7 @@ function Network (container, data, options) {
       levelSeparation: 150,
       nodeSpacing: 100,
       direction: "UD",   // UD, DU, LR, RL
-      layout: "hubsize" // hubsize, directed, uniqueDirected
+      layout: "hubsize" // hubsize, directed
     },
     freezeForStabilization: false,
     smoothCurves: {
diff --git a/lib/network/mixins/HierarchicalLayoutMixin.js b/lib/network/mixins/HierarchicalLayoutMixin.js
index 3cd6e726..a49ffba4 100644
--- a/lib/network/mixins/HierarchicalLayoutMixin.js
+++ b/lib/network/mixins/HierarchicalLayoutMixin.js
@@ -18,23 +18,6 @@ exports._resetLevels = function() {
  */
 exports._setupHierarchicalLayout = function() {
   if (this.constants.hierarchicalLayout.enabled == true && this.nodeIndices.length > 0) {
-    if (this.constants.hierarchicalLayout.direction == "RL" || this.constants.hierarchicalLayout.direction == "DU") {
-      this.constants.hierarchicalLayout.levelSeparation = this.constants.hierarchicalLayout.levelSeparation < 0 ? this.constants.hierarchicalLayout.levelSeparation : this.constants.hierarchicalLayout.levelSeparation * -1;
-    }
-    else {
-      this.constants.hierarchicalLayout.levelSeparation = Math.abs(this.constants.hierarchicalLayout.levelSeparation);
-    }
-
-    if (this.constants.hierarchicalLayout.direction == "RL" || this.constants.hierarchicalLayout.direction == "LR") {
-      if (this.constants.smoothCurves.enabled == true) {
-        this.constants.smoothCurves.type = "vertical";
-      }
-    }
-    else {
-      if (this.constants.smoothCurves.enabled == true) {
-        this.constants.smoothCurves.type = "horizontal";
-      }
-    }
     // get the size of the largest hubs and check if the user has defined a level for a node.
     var hubsize = 0;
     var node, nodeId;
@@ -74,7 +57,7 @@ exports._setupHierarchicalLayout = function() {
           this._determineLevels(hubsize);
         }
         else {
-          this._determineLevelsDirected();
+          this._determineLevelsDirected(false);
         }
 
       }
@@ -271,6 +254,23 @@ exports._changeConstants = function() {
     this.constants.smoothCurves.dynamic = false;
   }
   this._configureSmoothCurves();
+
+  var config = this.constants.hierarchicalLayout;
+  config.levelSeparation = Math.abs(config.levelSeparation);
+  if (config.direction == "RL" || config.direction == "DU") {
+    config.levelSeparation *= -1;
+  }
+
+  if (config.direction == "RL" || config.direction == "LR") {
+    if (this.constants.smoothCurves.enabled == true) {
+      this.constants.smoothCurves.type = "vertical";
+    }
+  }
+  else {
+    if (this.constants.smoothCurves.enabled == true) {
+      this.constants.smoothCurves.type = "horizontal";
+    }
+  }
 };
 
 
@@ -358,9 +358,9 @@ exports._setLevel = function(level, edges, parentId) {
  */
 exports._setLevelDirected = function(level, edges, parentId) {
   this.nodes[parentId].hierarchyEnumerated = true;
+  var childNode, direction;
   for (var i = 0; i < edges.length; i++) {
-    var childNode = null;
-    var direction = 1;
+    direction = 1;
     if (edges[i].toId == parentId) {
       childNode = edges[i].from;
       direction = -1;
@@ -374,9 +374,9 @@ exports._setLevelDirected = function(level, edges, parentId) {
   }
 
   for (var i = 0; i < edges.length; i++) {
-    var childNode = null;
     if (edges[i].toId == parentId) {childNode = edges[i].from;}
     else {childNode = edges[i].to;}
+
     if (childNode.edges.length > 1 && childNode.hierarchyEnumerated === false) {
       this._setLevelDirected(childNode.level, childNode.edges, childNode.id);
     }