diff --git a/src/js/familyTreeJS.js b/src/js/familyTreeJS.js index 767265dd7932d88188f1a02a0c618add486e8c39..9b9f993adb2c7622a993a46cbe42810d1d4bb96d 100644 --- a/src/js/familyTreeJS.js +++ b/src/js/familyTreeJS.js @@ -20,13 +20,13 @@ var lastActiveSlave, lastSlaves, lastPC; window.renderFamilyTree = function(slaves, filterID) { 'use strict'; - var ftreeWidth,ftreeHeight; + var ftreeWidth, ftreeHeight; var chartWidth, chartHeight; var margin; d3.select('#ftree-canvas').remove(); var svg = d3.select('#familyTree') .append('svg') - .attr('id','ftree-canvas'); + .attr('id', 'ftree-canvas'); var chartLayer = svg.append('g').classed('chartLayer', true); var data = buildFamilyTree(slaves, filterID); @@ -59,18 +59,18 @@ window.renderFamilyTree = function(slaves, filterID) { svg.append('defs'); svg.append('defs').append('marker') - .attr('id','arrowhead') - .attr('viewBox','-0 -5 10 10') - .attr('refX',13) - .attr('refY',0) - .attr('orient','auto') - .attr('markerWidth',13) - .attr('markerHeight',13) - .attr('xoverflow','visible') + .attr('id', 'arrowhead') + .attr('viewBox', '-0 -5 10 10') + .attr('refX', 13) + .attr('refY', 0) + .attr('orient', 'auto') + .attr('markerWidth', 13) + .attr('markerHeight', 13) + .attr('xoverflow', 'visible') .append('svg:path') .attr('d', 'M 0,-1 L 5,0 L 0,1') .attr('fill', '#a1a1a1') - .style('stroke','none'); + .style('stroke', 'none'); chartLayer .attr('width', chartWidth) @@ -93,7 +93,7 @@ window.renderFamilyTree = function(slaves, filterID) { .data(data.links) .enter() .append('line') - .attr('marker-end','url(#arrowhead)') + .attr('marker-end', 'url(#arrowhead)') .attr('stroke', function(d) { if(d.type === 'homologous') { return '#862d59'; @@ -498,10 +498,10 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS function getSlave(id, expectedGenes) { if(id === -1) { - return {"slaveName":"YOU", "ID":id, "physicalAge":PC.physicalAge, "genes":PC.genes, father:PC.father, mother:PC.mother}; + return {"slaveName": "YOU", "ID": id, "physicalAge": PC.physicalAge, "genes": PC.genes, "father": PC.father, "mother": PC.mother}; } if(id === 0) { - return {"slaveName":"-", "ID":id, "genes":expectedGenes}; + return {"slaveName": "-", "ID": id, "genes": expectedGenes}; } if(id === activeSlave.ID) { return activeSlave; @@ -510,7 +510,7 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS if(slaves[i].ID === id) return slaves[i]; } - return {"slaveName":"-", "ID":id, "genes":expectedGenes}; + return {"slaveName": "-", "ID": id, "genes": expectedGenes}; } function slaveInfo(slave, activeSlaveId, recursionProtectSlaveId = {}) { @@ -547,7 +547,7 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS } var data = { "name": slave.slaveName + (slave.physicalAge?(" (" + slave.physicalAge + ")"):""), - "class" : slave.genes, + "class": slave.genes, "textClass": (activeSlaveId === slave.ID)?"emphasis":"", "marriages": [], }; @@ -611,7 +611,7 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS if(!parentWidth) parentWidth = document.body.offsetWidth - 483; - console.log(parentWidth, Math.min(200 + 40*numTreeNodes,parentWidth-200) + 200); + console.log(parentWidth, Math.min(200 + 40*numTreeNodes, parentWidth-200) + 200); dTree.init(treeData, { target: "#graph",