Fix-bug: option nodeChilidren is not available

dabeng · Jul 29, 2016 · 834c04c · 834c04c
1 parent 1e13288
commit 834c04c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/dist/js/jquery.orgchart.js b/dist/js/jquery.orgchart.js
@@ -234,9 +234,9 @@
     var children = data[opts.nodeChildren]
     data.relationship = flags + (children && children.length > 0 ? 1 : 0);
     if (children) {
-    children.forEach(function(item) {
-      attachRel(item, '1' + (children.length > 1 ? 1 :0), opts);
-    });
+      children.forEach(function(item) {
+        attachRel(item, '1' + (children.length > 1 ? 1 :0), opts);
+      });
     }
     return data;
   }

diff --git a/examples/js/jquery.orgchart.js b/examples/js/jquery.orgchart.js
@@ -75,7 +75,7 @@
       if (data instanceof $) { // ul datasource
         buildHierarchy($chart, buildJsonDS(data.children()), 0, opts);
       } else { // local json datasource
-        buildHierarchy($chart, opts.ajaxURL ? data : attachRel(data, '00'), 0, opts);
+        buildHierarchy($chart, opts.ajaxURL ? data : attachRel(data, '00', opts), 0, opts);
       }
     } else {
       $.ajax({
@@ -86,7 +86,7 @@
         }
       })
       .done(function(data, textStatus, jqXHR) {
-        buildHierarchy($chart, opts.ajaxURL ? data : attachRel(data, '00'), 0, opts);
+        buildHierarchy($chart, opts.ajaxURL ? data : attachRel(data, '00', opts), 0, opts);
       })
       .fail(function(jqXHR, textStatus, errorThrown) {
         console.log(errorThrown);
@@ -230,12 +230,13 @@
     return subObj;
   }
 
-  function attachRel(data, flags) {
-    data.relationship = flags + (data.children ? 1 : 0);
-    if (data.children) {
-    data.children.forEach(function(item) {
-      attachRel(item, '1' + (data.children.length > 1 ? 1 :0));
-    });
+  function attachRel(data, flags, opts) {
+    var children = data[opts.nodeChildren]
+    data.relationship = flags + (children && children.length > 0 ? 1 : 0);
+    if (children) {
+      children.forEach(function(item) {
+        attachRel(item, '1' + (children.length > 1 ? 1 :0), opts);
+      });
     }
     return data;
   }