Skip to content

Commit 09c0d8e

Browse files
committed
WIP: implement family tree
1 parent c4b173f commit 09c0d8e

File tree

6 files changed

+18
-26
lines changed

6 files changed

+18
-26
lines changed

demo/family-tree.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
var datascource = [
2323
{ 'id': '1', 'name': 'Lao Ye', 'title': 'vice general manager', 'gender': 'male' },
2424
{
25-
'id': '1', 'name': 'Lao Lao', 'title': 'general manager', 'gender': 'female',
25+
'id': '2', 'name': 'Lao Lao', 'title': 'general manager', 'gender': 'female',
2626
'children': [
2727
[
2828
{ 'id': '3', 'name': 'Bo Miao', 'title': 'department manager', 'gender': 'female' },

demo/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
background-color: #000;
1414
}
1515
section {
16-
width: 30rem;
16+
width: 36rem;
1717
margin-top: 200px;
1818
margin-left: auto;
1919
margin-right: auto;

dist/js/jquery.orgchart.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,11 +1427,12 @@
14271427
} else {
14281428
level = data.level = $appendTo.parentsUntil('.orgchart', '.nodes').length;
14291429
}
1430-
// Construct the node
1430+
// Construct the single node in OrgChart or the multiple nodes in family tree
14311431
if (Object.keys(data).length > 2) {
14321432
$nodeDiv = this.createNode(data);
14331433
$appendTo.append($nodeDiv);
14341434
}
1435+
14351436
// Construct the "inferior nodes"
14361437
if (data.children && data.children.length) {
14371438
var isHidden = level + 1 > opts.visibleLevel || (data.collapsed !== undefined && data.collapsed);
@@ -1443,22 +1444,17 @@
14431444
}
14441445
if (((opts.verticalLevel && level + 1 === opts.verticalLevel) || data.hybrid)
14451446
&& !$appendTo.closest('.vertical').length) {
1446-
$appendTo.append($nodesLayer.addClass('vertical'));
1447-
} else {
1448-
$appendTo.append($nodesLayer);
1447+
$nodesLayer.addClass('vertical');
14491448
}
1449+
$appendTo.append($nodesLayer);
14501450
} else if (data.compact) {
14511451
$nodeDiv.addClass('compact');
14521452
} else {
14531453
$nodesLayer = $('<ul class="nodes' + (isHidden ? ' hidden' : '') + '">');
1454-
if (Object.keys(data).length === 2) {
1455-
$appendTo.append($nodesLayer);
1456-
} else {
1457-
if (isHidden) {
1458-
$appendTo.addClass('isChildrenCollapsed');
1459-
}
1460-
$appendTo.append($nodesLayer);
1454+
if (isHidden) {
1455+
$appendTo.addClass('isChildrenCollapsed');
14611456
}
1457+
$appendTo.append($nodesLayer);
14621458
}
14631459
// recurse through children nodes
14641460
$.each(data.children, function () {

dist/js/jquery.orgchart.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/jquery.orgchart.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/jquery.orgchart.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,11 +1427,12 @@
14271427
} else {
14281428
level = data.level = $appendTo.parentsUntil('.orgchart', '.nodes').length;
14291429
}
1430-
// Construct the node
1430+
// Construct the single node in OrgChart or the multiple nodes in family tree
14311431
if (Object.keys(data).length > 2) {
14321432
$nodeDiv = this.createNode(data);
14331433
$appendTo.append($nodeDiv);
14341434
}
1435+
14351436
// Construct the "inferior nodes"
14361437
if (data.children && data.children.length) {
14371438
var isHidden = level + 1 > opts.visibleLevel || (data.collapsed !== undefined && data.collapsed);
@@ -1443,22 +1444,17 @@
14431444
}
14441445
if (((opts.verticalLevel && level + 1 === opts.verticalLevel) || data.hybrid)
14451446
&& !$appendTo.closest('.vertical').length) {
1446-
$appendTo.append($nodesLayer.addClass('vertical'));
1447-
} else {
1448-
$appendTo.append($nodesLayer);
1447+
$nodesLayer.addClass('vertical');
14491448
}
1449+
$appendTo.append($nodesLayer);
14501450
} else if (data.compact) {
14511451
$nodeDiv.addClass('compact');
14521452
} else {
14531453
$nodesLayer = $('<ul class="nodes' + (isHidden ? ' hidden' : '') + '">');
1454-
if (Object.keys(data).length === 2) {
1455-
$appendTo.append($nodesLayer);
1456-
} else {
1457-
if (isHidden) {
1458-
$appendTo.addClass('isChildrenCollapsed');
1459-
}
1460-
$appendTo.append($nodesLayer);
1454+
if (isHidden) {
1455+
$appendTo.addClass('isChildrenCollapsed');
14611456
}
1457+
$appendTo.append($nodesLayer);
14621458
}
14631459
// recurse through children nodes
14641460
$.each(data.children, function () {

0 commit comments

Comments
 (0)