Merge branch 'master' of github.com:KharitonOff/angular-data-table

Author: marti4ka

release/dataTable.cjs.js

@@ -1031,29 +1031,27 @@ var BodyController = function () {
   }, {
     key: "buildTree",
     value: function buildTree() {
-      var count = 0,
-          temp = [];
-
-      for (var i = 0, len = this.rows.length; i < len; i++) {
-        var row = this.rows[i],
-            relVal = row[this.treeColumn.relationProp],
-            keyVal = row[this.treeColumn.prop],
-            rows = this.rowsByGroup[keyVal],
-            expanded = this.expanded[keyVal];
-
-        if (!relVal) {
-          count++;
-          temp.push(row);
-        }
-
-        if (rows && rows.length) {
-          if (expanded) {
-            temp.push.apply(temp, _toConsumableArray(rows));
-            count = count + rows.length;
+      var temp = [],
+          self = this;
+
+      function addChildren(fromArray, toArray, level) {
+        fromArray.forEach(function (row) {
+          var relVal = row[self.treeColumn.relationProp],
+              key = row[self.treeColumn.prop],
+              groupRows = self.rowsByGroup[key],
+              expanded = self.expanded[key];
+
+          if (level > 0 || !relVal) {
+            toArray.push(row);
+            if (groupRows && groupRows.length > 0 && expanded) {
+              addChildren(groupRows, toArray, level + 1);
+            }
           }
-        }
+        });
       }
 
+      addChildren(this.rows, temp, 0);
+
       return temp;
     }
   }, {

release/dataTable.es6.js

@@ -1272,29 +1272,28 @@ class BodyController{
    * @return {array} the built tree
    */
   buildTree(){
-    var count = 0,
-        temp = [];
-
-    for(var i = 0, len = this.rows.length; i < len; i++) {
-      var row = this.rows[i],
-          relVal = row[this.treeColumn.relationProp],
-          keyVal = row[this.treeColumn.prop],
-          rows = this.rowsByGroup[keyVal],
-          expanded = this.expanded[keyVal];
-
-      if(!relVal){
-        count++;
-        temp.push(row);
-      }
-
-      if(rows && rows.length){
-        if(expanded){
-          temp.push(...rows);
-          count = count + rows.length;
+    var temp = [],
+        self = this;
+
+    function addChildren(fromArray, toArray, level) {
+      fromArray.forEach(function (row) {
+        var relVal = row[self.treeColumn.relationProp],
+            key = row[self.treeColumn.prop],
+            groupRows = self.rowsByGroup[key],
+            expanded = self.expanded[key];
+
+        if (level > 0 || !relVal) {
+          toArray.push(row);
+          if (groupRows && groupRows.length > 0 && expanded) {
+            addChildren(groupRows, toArray, level + 1);
+          }
         }
-      }
+
+      });
     }
 
+    addChildren(this.rows, temp, 0);
+
     return temp;
   }
 

release/dataTable.js

@@ -1072,29 +1072,27 @@
     }, {
       key: "buildTree",
       value: function buildTree() {
-        var count = 0,
-            temp = [];
-
-        for (var i = 0, len = this.rows.length; i < len; i++) {
-          var row = this.rows[i],
-              relVal = row[this.treeColumn.relationProp],
-              keyVal = row[this.treeColumn.prop],
-              rows = this.rowsByGroup[keyVal],
-              expanded = this.expanded[keyVal];
-
-          if (!relVal) {
-            count++;
-            temp.push(row);
-          }
-
-          if (rows && rows.length) {
-            if (expanded) {
-              temp.push.apply(temp, _toConsumableArray(rows));
-              count = count + rows.length;
+        var temp = [],
+            self = this;
+
+        function addChildren(fromArray, toArray, level) {
+          fromArray.forEach(function (row) {
+            var relVal = row[self.treeColumn.relationProp],
+                key = row[self.treeColumn.prop],
+                groupRows = self.rowsByGroup[key],
+                expanded = self.expanded[key];
+
+            if (level > 0 || !relVal) {
+              toArray.push(row);
+              if (groupRows && groupRows.length > 0 && expanded) {
+                addChildren(groupRows, toArray, level + 1);
+              }
             }
-          }
+          });
         }
 
+        addChildren(this.rows, temp, 0);
+
         return temp;
       }
     }, {