Merge pull request #3516 from PaulL1/fixes2

Fix(treeView): fix #3399 when collapse row expandAll should be unset
angular-ui · May 16, 2015 · 9be0549 · 9be0549
2 parents 869be69 + 394a919
commit 9be0549
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/features/tree-view/js/tree-view.js b/src/features/tree-view/js/tree-view.js
@@ -515,6 +515,7 @@
 
           if ( row.treeExpandedState.state !== uiGridTreeViewConstants.COLLAPSED ){
             row.treeExpandedState.state = uiGridTreeViewConstants.COLLAPSED;
+            grid.treeView.expandAll = false;
             grid.api.treeView.raise.rowCollapsed(row);
             grid.queueGridRefresh();
           }
@@ -536,6 +537,7 @@
           }
 
           service.setAllNodes(grid, row.treeExpandedState, uiGridTreeViewConstants.COLLAPSED);
+          grid.treeView.expandAll = false;
           grid.queueGridRefresh();
         },
 

diff --git a/src/features/tree-view/test/tree-view.spec.js b/src/features/tree-view/test/tree-view.spec.js
@@ -1,4 +1,4 @@
-ddescribe('ui.grid.treeView uiGridTreeViewService', function () {
+describe('ui.grid.treeView uiGridTreeViewService', function () {
   var uiGridTreeViewService;
   var uiGridTreeViewConstants;
   var gridClassFactory;