Merge pull request angular-ui-tree#582 from angular-ui-tree/#478_out_of_depth_calculation

angular-ui-tree#478 out of depth calculation

Author: Niels Dequeker

package.json

@@ -2,6 +2,7 @@
   "name": "angular-ui-tree",
   "version": "2.9.0",
   "description": "An AngularJS UI component that can sort nested lists, provides drag & drop support and doesn't depend on jQuery",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular-ui-tree/angular-ui-tree"

source/controllers/nodeCtrl.js

@@ -112,31 +112,32 @@
           return 1;
         };
 
-        var subDepth = 0;
-        function countSubDepth(scope) {
-          var i, childNodes,
-              count = 0,
-              nodes = scope.childNodes();
-
-          for (i = 0; i < nodes.length; i++) {
-            childNodes = nodes[i].$childNodesScope;
-
-            if (childNodes && childNodes.childNodesCount() > 0) {
-              count = 1;
-              countSubDepth(childNodes);
-            }
+        /**
+        * Returns the depth of the deepest subtree under this node
+        * @param scope a TreeNodesController scope object
+        * @returns Depth of all nodes *beneath* this node. If scope belongs to a leaf node, the
+        *   result is 0 (it has no subtree).
+        */
+        function countSubTreeDepth(scope) {
+          var thisLevelDepth = 0,
+              childNodes = scope.childNodes(),
+              childNode,
+              childDepth,
+              i;
+          if (!childNodes || childNodes.length === 0) {
+            return 0;
           }
-          subDepth += count;
+          for (i = childNodes.length - 1; i >= 0 ; i--) {
+            childNode = childNodes[i],
+            childDepth = 1 + countSubTreeDepth(childNode);
+            thisLevelDepth = Math.max(thisLevelDepth, childDepth);
+          }
+          return thisLevelDepth;
         }
 
         $scope.maxSubDepth = function () {
-          subDepth = 0;
-          if ($scope.$childNodesScope) {
-            countSubDepth($scope.$childNodesScope);
-          }
-          return subDepth;
+          return $scope.$childNodesScope ? countSubTreeDepth($scope.$childNodesScope) : 0;
         };
-
       }
     ]);
 })();

source/controllers/nodeCtrl.spec.js

@@ -46,129 +46,129 @@ describe('treeCtrl', function () {
 
     scope.list = [
       {
-        'id': 1,
-        'title': 'item1',
+        'id': 0,
+        'title': 'item0',
         'items': []
       },
       {
-        'id': 2,
-        'title': 'item2',
+        'id': 1,
+        'title': 'item1',
         'items': [
           {
-            'id': 21,
-            'title': 'item2.1',
+            'id': 10,
+            'title': 'item1.0',
             'items': [
               {
-                'id': 211,
-                'title': 'item2.1.1',
+                'id': 100,
+                'title': 'item1.0.0',
                 'items': []
               },
               {
-                'id': 212,
-                'title': 'item2.1.2',
+                'id': 101,
+                'title': 'item1.0.1',
                 'items': []
               },
               {
-                'id': 213,
-                'title': 'item2.1.3',
+                'id': 102,
+                'title': 'item1.0.2',
                 'items': []
               }
             ]
           },
           {
-            'id': 22,
-            'title': 'item2.2',
+            'id': 11,
+            'title': 'item1.1',
             'items': []
           },
           {
-            'id': 23,
-            'title': 'item2.3',
+            'id': 12,
+            'title': 'item1.2',
             'items': [
               {
-                'id': 231,
-                'title': 'item2.3.1',
+                'id': 120,
+                'title': 'item1.2.0',
                 'items': []
               },
               {
-                'id': 232,
-                'title': 'item2.3.2',
+                'id': 121,
+                'title': 'item1.2.1',
                 'items': []
               },
               {
-                'id': 233,
-                'title': 'item2.3.3',
+                'id': 122,
+                'title': 'item1.2.2',
                 'items': []
               }
             ]
           },
           {
-            'id': 24,
-            'title': 'item2.4',
+            'id': 13,
+            'title': 'item1.3',
             'items': [
               {
-                'id': 241,
-                'title': 'item2.4.1',
+                'id': 130,
+                'title': 'item1.3.0',
                 'items': []
               },
               {
-                'id': 242,
-                'title': 'item2.4.2',
+                'id': 131,
+                'title': 'item1.3.1',
                 'items': []
               },
               {
-                'id': 243,
+                'id': 132,
                 'title': 'item2.4.3',
                 'items': []
               },
               {
                 'id': 244,
-                'title': 'item2.4.4',
+                'title': 'item1.3.3',
                 'items': []
               }
             ]
           }
         ]
       },
       {
-        'id': 3,
-        'title': 'item3',
+        'id': 2,
+        'title': 'item2',
         'items': [
           {
-            'id': 31,
-            'title': 'item3.1',
+            'id': 20,
+            'title': 'item2.0',
             'items': []
           },
           {
-            'id': 32,
-            'title': 'item3.2',
+            'id': 21,
+            'title': 'item2.1',
             'items': []
           },
           {
-            'id': 33,
-            'title': 'item3.3',
+            'id': 22,
+            'title': 'item2.2',
             'items': [
               {
-                'id': 331,
-                'title': 'item3.3.1',
+                'id': 220,
+                'title': 'item2.2.0',
                 'items': []
               },
               {
-                'id': 332,
-                'title': 'item3.3.2',
+                'id': 221,
+                'title': 'item2.2.1',
                 'items': []
               },
               {
-                'id': 333,
-                'title': 'item3.3.3',
+                'id': 222,
+                'title': 'item2.2.2',
                 'items': []
               }
             ]
           }
         ]
       },
       {
-        'id': 4,
-        'title': 'item4',
+        'id': 3,
+        'title': 'item3',
         'items': []
       }
     ];
@@ -185,8 +185,18 @@ describe('treeCtrl', function () {
     tree = createTree();
     localScope = angular.element(tree.children('ol').first()).scope();
 
-    expect(localScope.childNodes()[1].maxSubDepth()).toEqual(1);
+    expect(localScope.childNodes()[1].maxSubDepth()).toEqual(2);
+
+  });
 
+  it('should calculate the depth of any subtree', function () {
+    var tree, localScope;
+    tree = createTree();
+    localScope = angular.element(tree.children('ol').first()).scope();
+    expect(localScope.childNodes()[0].maxSubDepth()).toEqual(0); // item0
+    expect(localScope.childNodes()[1].maxSubDepth()).toEqual(2); // item1
+    expect(localScope.childNodes()[1].childNodes()[0].maxSubDepth()).toEqual(1); // item1.0
+    expect(localScope.childNodes()[1].childNodes()[0].childNodes()[0].maxSubDepth()).toEqual(0); // item1.0.0
   });
 });