Merge branch 'master' into gh-pages

Author: nickperkinslondon

README.md

@@ -1,10 +1,9 @@
-
 angular-bootstrap-nav-tree
 ==========================
 
 This is a Tree directive for Angular JS apps that use Bootstrap CSS.
 
-example: http://nickperkinslondon.github.io/angular-bootstrap-nav-tree/test/bs2_test_page.html
+example: http://nickperkinslondon.github.io/angular-bootstrap-nav-tree/test/bs2_ng115_test_page.html
 
 The style is completely Bootstrap because the tree is actually just a Bootstrap "nav" list, with a few changes:  Indentation is added, expand/collapse icons are added, and Angular CSS animations are used during expand/collapse.
 
@@ -40,7 +39,7 @@ But there are other attributes to customize the tree:
         tree-data         = "example_treedata"
         icon-leaf         = "icon-file"
         icon-expand       = "icon-plus-sign"
-        icon-contract     = "icon-minus-sign"
+        icon-collapse     = "icon-minus-sign"
         on-select         = "my_tree_handler(branch)"
         expand-level      = "2"
         initial-selection = "Vegetable">      

README.md~

@@ -0,0 +1,80 @@
+
+angular-bootstrap-nav-tree
+==========================
+
+This is a Tree directive for Angular JS apps that use Bootstrap CSS.
+
+example: http://nickperkinslondon.github.io/angular-bootstrap-nav-tree/test/bs2_test_page.html
+
+The style is completely Bootstrap because the tree is actually just a Bootstrap "nav" list, with a few changes:  Indentation is added, expand/collapse icons are added, and Angular CSS animations are used during expand/collapse.
+
+The abn-tree now works Bootsrap 2, or Bootstrap 3, and with Angular 1.1.5 or 1.2.0
+
+The normal Glyphicons work well, but they appear black instead of blue.  Alternatively, you can use the Font Awesome icons, which look even better, and match the blue color of the text.
+
+You can change the icons used by specifying them in html attributes.
+
+This tree is developed using CoffeeScript and Jade, but you don't need to be using either of those to use this tree -- you just have to be using Angular and Bootsrap.
+
+
+How to use it:
+Just include the 3 files from "dist":
+
+    abn_tree_directive.js
+    abn_tree_template.html
+    abn_tree.css
+
+NOTE: you will have to adjust the "templateUrl" in the directive js, to adjust for your directory structure.
+
+
+Then put an `<abn-tree>` directive in your HTML.
+( see the example in "test" )
+
+At a miniumum, you must supply `tree-data` :
+
+    <abn-tree tree-data="example_treedata"></abn-tree>
+
+But there are other attributes to customize the tree:
+
+    <abn-tree 
+        tree-data         = "example_treedata"
+        icon-leaf         = "icon-file"
+        icon-expand       = "icon-plus-sign"
+        icon-contract     = "icon-minus-sign"
+        on-select         = "my_tree_handler(branch)"
+        expand-level      = "2"
+        initial-selection = "Vegetable">      
+    ></abn-tree>
+
+
+The data to create the tree is defined in your controller, and could be as simple as this:
+
+    $scope.my_data = [{
+      label: 'Languages',
+      children: ['Jade','Less','Coffeescript']
+    }]
+
+There is a long-form for elements, in which each node is an object with a "label", and optionally other stuff like "data", and "children".
+There is a short-form for listing nodes children (as used for "children" above), where the "children" is just a list of strings.
+If you use the short-form for listing elements, then your "on-select" function will have to act based only upon the "branch.label".  If you use the 
+long-form, where is branch is an object, then you can also attach "data" to a branch.
+
+
+
+You can supply a single default "on-select" function for the whole tree -- it will be called whenever a branch is selected:
+
+    $scope.my_tree_hander = function(branch){...}
+
+
+Or, you can put a custom "on-select" function on an individual branch:
+
+    $scope.my_data = [{
+      label: 'Languages',
+      onSelect: function(branch){...},
+      children: ['Jade','Less','Coffeescript']
+    }]
+    
+Each branch can have a "data" element which you can use to hold whatever data you want.  It is not touched by the tree, and it is available to your "on-select" function as "branch.data".  In the example, in the "test" folder, this technique is used in "my_tree_handler" to add extra info to "Dog","Cat", and "Hippo".  
+
+Warning: If you attach extra attributes directly to a branch (instead of to "branch.data"), they could conflict with the internal workings of the tree, which adds branch attributes at runtime, like "expanded" and "selected".
+

dist/abn_tree.css

@@ -105,17 +105,17 @@ ul.nav.abn-tree .level-5 .indented {
 }
 ul.nav.abn-tree .level-6 .indented {
   position: relative;
-  left: 80px;
+  left: 100px;
 }
 ul.nav.nav-list.abn-tree .level-7 .indented {
   position: relative;
-  left: 100px;
+  left: 120px;
 }
 ul.nav.nav-list.abn-tree .level-8 .indented {
   position: relative;
-  left: 120px;
+  left: 140px;
 }
 ul.nav.nav-list.abn-tree .level-9 .indented {
   position: relative;
-  left: 140px;
+  left: 160px;
 }

dist/abn_tree_directive.js

@@ -9,10 +9,15 @@ module.directive('abnTree', function($timeout) {
     scope: {
       treeData: '=',
       onSelect: '&',
-      initialSelection: '='
+      initialSelection: '@'
     },
     link: function(scope, element, attrs) {
-      var expand_level, for_each_branch, on_treeData_change, select_branch, selected_branch;
+      var error, expand_all_parents, expand_level, for_all_ancestors, for_each_branch, get_parent, on_treeData_change, select_branch, selected_branch;
+      error = function(s) {
+        console.log('ERROR:' + s);
+        debugger;
+        return void 0;
+      };
       if (attrs.iconExpand == null) {
         attrs.iconExpand = 'icon-plus';
       }
@@ -29,15 +34,13 @@ module.directive('abnTree', function($timeout) {
       scope.header = attrs.header;
       if (!scope.treeData) {
         alert('no treeData defined for the tree!');
-        debugger;
         return;
       }
       if (scope.treeData.length == null) {
         if (treeData.label != null) {
           scope.treeData = [treeData];
         } else {
           alert('treeData should be an array of root branches');
-          debugger;
           return;
         }
       }
@@ -70,12 +73,20 @@ module.directive('abnTree', function($timeout) {
       });
       selected_branch = null;
       select_branch = function(branch) {
+        if (!branch) {
+          if (selected_branch != null) {
+            selected_branch.selected = false;
+          }
+          selected_branch = null;
+          return;
+        }
         if (branch !== selected_branch) {
           if (selected_branch != null) {
             selected_branch.selected = false;
           }
           branch.selected = true;
           selected_branch = branch;
+          expand_all_parents(branch);
           if (branch.onSelect != null) {
             return $timeout(function() {
               return branch.onSelect(branch);
@@ -96,9 +107,52 @@ module.directive('abnTree', function($timeout) {
           return select_branch(branch);
         }
       };
+      get_parent = function(child) {
+        var parent;
+        parent = void 0;
+        if (child.parent_uid) {
+          for_each_branch(function(b) {
+            if (b.uid === child.parent_uid) {
+              return parent = b;
+            }
+          });
+        }
+        return parent;
+      };
+      for_all_ancestors = function(child, fn) {
+        var parent;
+        parent = get_parent(child);
+        if (parent != null) {
+          fn(parent);
+          return for_all_ancestors(parent, fn);
+        }
+      };
+      expand_all_parents = function(child) {
+        return for_all_ancestors(child, function(b) {
+          return b.expanded = true;
+        });
+      };
       scope.tree_rows = [];
       on_treeData_change = function() {
         var add_branch_to_list, root_branch, _i, _len, _ref, _results;
+        for_each_branch(function(b, level) {
+          if (!b.uid) {
+            return b.uid = "" + Math.random();
+          }
+        });
+        console.log('UIDs are set.');
+        for_each_branch(function(b) {
+          var child, _i, _len, _ref, _results;
+          if (angular.isArray(b.children)) {
+            _ref = b.children;
+            _results = [];
+            for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+              child = _ref[_i];
+              _results.push(child.parent_uid = b.uid);
+            }
+            return _results;
+          }
+        });
         scope.tree_rows = [];
         for_each_branch(function(branch) {
           if (branch.children) {
@@ -118,11 +172,6 @@ module.directive('abnTree', function($timeout) {
             return branch.children = [];
           }
         });
-        for_each_branch(function(b, level) {
-          if (!b.uid) {
-            return b.uid = "" + Math.random();
-          }
-        });
         add_branch_to_list = function(level, branch, visible) {
           var child, child_visible, tree_icon, _i, _len, _ref, _results;
           if (branch.expanded == null) {
@@ -163,14 +212,16 @@ module.directive('abnTree', function($timeout) {
         }
         return _results;
       };
+      scope.$watch('treeData', on_treeData_change, true);
       if (attrs.initialSelection != null) {
-        for_each_branch(function(b) {
+        return for_each_branch(function(b) {
           if (b.label === attrs.initialSelection) {
-            return select_branch(b);
+            return $timeout(function() {
+              return select_branch(b);
+            });
           }
         });
       }
-      return scope.$watch('treeData', on_treeData_change, true);
     }
   };
 });

dist/abn_tree_template.html

@@ -3,7 +3,7 @@
   <li ng-repeat="row in tree_rows | filter:{visible:true} track by row.branch.uid" ng-animate="'abn-tree-animate'" ng-class="'level-' + {{ row.level }} + (row.branch.selected ? ' active':'')" class="abn-tree-row">
     <a ng-click="user_clicks_branch(row.branch)">
       <i ng-class="row.tree_icon" ng-click="row.branch.expanded = !row.branch.expanded" class="indented tree-icon"> </i>
-      <span class="indented tree-label">{{ row.label }}</span>
+      <span class="indented tree-label">{{ row.label }} </span>
     </a>
   </li>
 </ul>