Merge branch 'master' of https://github.com/angular-ui-tree/angular-ui-tree

Conflicts:
	source/controllers/nodeCtrl.js

Author: Stefan Mohr

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/angular-ui-tree.css

@@ -13,7 +13,6 @@
 }
 
 .angular-ui-tree-nodes {
-    display: block;
     position: relative;
     margin: 0;
     padding: 0;
@@ -25,7 +24,6 @@
 }
 
 .angular-ui-tree-node, .angular-ui-tree-placeholder {
-    display: block;
     position: relative;
     margin: 0;
     padding: 0;

source/controllers/nodeCtrl.js

@@ -112,7 +112,13 @@
           return 1;
         };
 
-        function countSubDepth(scope) {
+        /**
+        * 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,
@@ -121,16 +127,16 @@
           if (!childNodes || childNodes.length === 0) {
             return 0;
           }
-          for (i = 0; i < childNodes.length; i++) {
+          for (i = childNodes.length - 1; i >= 0 ; i--) {
             childNode = childNodes[i],
-            childDepth = 1 + countSubDepth(childNode);
+            childDepth = 1 + countSubTreeDepth(childNode);
             thisLevelDepth = Math.max(thisLevelDepth, childDepth);
           }
           return thisLevelDepth;
         }
 
         $scope.maxSubDepth = function () {
-          return $scope.$childNodesScope ? countSubDepth($scope.$childNodesScope) : 0;
+          return $scope.$childNodesScope ? countSubTreeDepth($scope.$childNodesScope) : 0;
         };
       }
     ]);