Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-master

src/js/familyTree.tw

@@ -27,7 +27,10 @@ window.renderFamilyTree = function(slaves, filterID) {
 	var ftreeWidth,ftreeHeight;
 	var chartWidth, chartHeight;
 	var margin;
-	var svg = d3.select('#familyTree').append('svg');
+	d3.select('#ftree-canvas').remove();
+	var svg = d3.select('#familyTree')
+		.append('svg')
+		.attr('id','ftree-canvas');
 	var chartLayer = svg.append('g').classed('chartLayer', true);
 
 	var range = 100;

src/utility/extendedFamilyWidgets.tw

@@ -877,7 +877,10 @@
 <<replace '#fatherName'>><<parentName "father">><</replace>>
 <<replace '#sameMotherNames'>><<listOfSlavesWithSameParent 'mother'>><</replace>>
 <<replace '#sameFatherNames'>><<listOfSlavesWithSameParent 'father'>><</replace>>
-<<run updateFamilyTree($activeSlave, $slaves, $PC)>>
+/* <<run updateFamilyTree($activeSlave, $slaves, $PC)>> */
+<<set _tSlaveList = [$activeSlave]>>
+<<set _tSlaveList.push.apply(_tSlaveList, $slaves)>>
+<<run renderFamilyTree(_tSlaveList, $activeSlave.ID)>>
 <</widget>>
 
 /* First parameter is e.g. "father" or "mother"   and second parameter is the ID to match */
@@ -1074,9 +1077,13 @@
 &nbsp;&nbsp;&nbsp;&nbsp;<span id="familySummary"><<Family>></span>
 <br>
 </div>
-<div id="graph"></div>
+/*<div id="graph"></div>
 <<run updateFamilyTree($activeSlave, $slaves, $PC)>>
-<script>updateFamilyTree()</script>
+<script>updateFamilyTree()</script>*/
+<div id="familyTree"></div>
+<<set _tSlaveList = [$activeSlave]>>
+<<set _tSlaveList.push.apply(_tSlaveList, $slaves)>>
+<<run renderFamilyTree(_tSlaveList, $activeSlave.ID)>>
 </div>
 
 <</widget>>