feature: Add click handlers for treevie toggles

iVantage · Nov 25, 2014 · 3b36988 · 3b36988
1 parent 90ad85b
commit 3b36988
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/dist/ivh-treeview.js b/dist/ivh-treeview.js
@@ -178,6 +178,7 @@ angular.module('ivh.treeview').directive('ivhTreeviewToggle', [function() {
       }
 
       element.bind('click', function() {
+        ctrl.onNodeClick(node);
         if(ctrl.children(node).length) {
           $li.toggleClass('ivh-treeview-node-collapsed');
         } else {
@@ -217,6 +218,7 @@ angular.module('ivh.treeview').directive('ivhTreeview', ['ivhTreeviewMgr', funct
 
       // Config options
       childrenAttribute: '=ivhTreeviewChildrenAttribute',
+      clickHandler: '=ivhTreeviewClickHandler',
       defaultSelectedState: '=ivhTreeviewDefaultSelectedState',
       expandToDepth: '=ivhTreeviewExpandToDepth',
       idAttribute: '=ivhTreeviewIdAttribute',
@@ -298,6 +300,10 @@ angular.module('ivh.treeview').directive('ivhTreeview', ['ivhTreeviewMgr', funct
           Infinity : localOpts.expandToDepth;
         return depth < expandTo;
       };
+
+      ctrl.onNodeClick = function(node) {
+        $scope.clickHandler(node, $scope.root);
+      };
     }],
     link: function(scope, element, attrs) {
       var opts = scope.ctrl.opts();

diff --git a/dist/ivh-treeview.min.js b/dist/ivh-treeview.min.js
diff --git a/src/scripts/directives/ivh-treeview-toggle.js b/src/scripts/directives/ivh-treeview-toggle.js
@@ -34,6 +34,7 @@ angular.module('ivh.treeview').directive('ivhTreeviewToggle', [function() {
       }
 
       element.bind('click', function() {
+        ctrl.onNodeClick(node);
         if(ctrl.children(node).length) {
           $li.toggleClass('ivh-treeview-node-collapsed');
         } else {

diff --git a/src/scripts/directives/ivh-treeview.js b/src/scripts/directives/ivh-treeview.js
@@ -27,6 +27,7 @@ angular.module('ivh.treeview').directive('ivhTreeview', ['ivhTreeviewMgr', funct
 
       // Config options
       childrenAttribute: '=ivhTreeviewChildrenAttribute',
+      clickHandler: '=ivhTreeviewClickHandler',
       defaultSelectedState: '=ivhTreeviewDefaultSelectedState',
       expandToDepth: '=ivhTreeviewExpandToDepth',
       idAttribute: '=ivhTreeviewIdAttribute',
@@ -108,6 +109,10 @@ angular.module('ivh.treeview').directive('ivhTreeview', ['ivhTreeviewMgr', funct
           Infinity : localOpts.expandToDepth;
         return depth < expandTo;
       };
+
+      ctrl.onNodeClick = function(node) {
+        $scope.clickHandler(node, $scope.root);
+      };
     }],
     link: function(scope, element, attrs) {
       var opts = scope.ctrl.opts();

diff --git a/test/spec/directives/ivh-treeview.js b/test/spec/directives/ivh-treeview.js
@@ -152,14 +152,20 @@ describe('Directive ivhTreeview', function() {
       $el = compile(tplClickHandler, scope);
     });
 
+    it('should call the click handler once per click', function() {
+      $el.find('li[title="top hat"] [ivh-treeview-toggle]').first().click();
+      scope.$apply();
+      expect(handlerSpy.calls.count()).toEqual(1);
+    });
+
     it('should pass the clicked node to the handler', function() {
-      $el.find('li[title="top hat"]').click();
+      $el.find('li[title="top hat"] [ivh-treeview-toggle]').first().click();
       scope.$apply();
-      expect(handlerSpy.calls.mostRecent().args[1]).toBe(scope.bag1[0]);
+      expect(handlerSpy.calls.mostRecent().args[0]).toBe(scope.bag1[0]);
     });
 
     it('should pass the tree itself to the click handler', function() {
-      $el.find('li[title="top hat"]').click();
+      $el.find('li[title="top hat"] [ivh-treeview-toggle]').click();
       scope.$apply();
       expect(handlerSpy.calls.mostRecent().args[1]).toBe(scope.bag1);
     });