color and fix rufuspollock-okfn#15 with #224

tonghuikang · Oct 27, 2019 · 05743c6 · 05743c6
1 parent 604ef45
commit 05743c6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/demos/assets/scripts/bubbletree.js b/demos/assets/scripts/bubbletree.js
@@ -1181,7 +1181,7 @@ var BubbleTree = function(config, onHover, onUnHover) {
 
 				rad2 = 0 - Math.max(
 					//hw *0.8 - tgtScale * (a2rad(node.parent.amount)+a2rad(node.amount)), // maximum visible part
-					hw * 0.8 - tgtScale * (a2rad(node.parent.amount) + a2rad(Math.max(node.amount*1.15 + node.maxChildAmount*1.15, node.left.amount * 0.85, node.right.amount * 0.85))),
+					hw * 0.8 - tgtScale * (a2rad(node.parent.amount) + a2rad(Math.max(node.amount*1.15 + node.maxChildAmount*1.15, (node.left ? node.left.amount : 0) * 0.85, (node.right ? node.right.amount : 0)  * 0.85))),
 					tgtScale*a2rad(node.parent.amount)*-1 + hw*0.15 // minimum visible part
 				) + hw;
 

diff --git a/demos/random/index.html b/demos/random/index.html
@@ -52,24 +52,23 @@
 					{
 						"label": "I am the 1st child",
 						"amount": 400000,
+						"color": "ff000f",
 						"children":[
 							{
 								"label": "I am the 1st child of the 1st",
-								"amount": 200000
+								"amount": 200000,
+								"color": "ff000f"
 							},
 							{
 								"label": "I am the 2nd child of the 1st",
-								"amount": 200000
+								"amount": 200000,
+								"color": "ff00ff"
 							}
 						]
 					},
 					{
 						"label": "I am the 2nd child",
 						"amount": 600000
-					},
-					{
-						"label": "I am the 3rd child",
-						"amount": 600000
 					}
 				]
 			}`);

diff --git a/src/js/bubbletree.js b/src/js/bubbletree.js
@@ -578,7 +578,7 @@ var BubbleTree = function(config, onHover, onUnHover) {
 
 				rad2 = 0 - Math.max(
 					//hw *0.8 - tgtScale * (a2rad(node.parent.amount)+a2rad(node.amount)), // maximum visible part
-					hw * 0.8 - tgtScale * (a2rad(node.parent.amount) + a2rad(Math.max(node.amount*1.15 + node.maxChildAmount*1.15, node.left.amount * 0.85, node.right.amount * 0.85))),
+					hw * 0.8 - tgtScale * (a2rad(node.parent.amount) + a2rad(Math.max(node.amount*1.15 + node.maxChildAmount*1.15, (node.left ? node.left.amount : 0) * 0.85, (node.right ? node.right.amount : 0)  * 0.85))),
 					tgtScale*a2rad(node.parent.amount)*-1 + hw*0.15 // minimum visible part
 				) + hw;