add single select click

Author: Ben Rubin

src/js/branch.js

@@ -280,27 +280,24 @@ function branchController($scope, $mdUtil, $animateCss) {
     // toggel branch
     if (e.target.classList.contains('md-branch-icon-container')) {
       toggleBranchClick(e);
-      e.stopPropagation();
       return;
     }
 
     // handle select
     var isSelect = $element.attr('select') !== undefined;
     if (isSelect && branchContainsElement(e.target)) {
       var selected = $element.attr('selected') !== undefined;
-      getTreeCtrl().toggleSelect(!selected, getTreeCtrl().hashGetter($scope[$scope.repeatName]), $scope[$scope.repeatName]);
-
       $element.attr('selected', !selected);
-      if (e.target.classList.contains('md-container')) { // clicked on checkbox
-        // deselect all and select this branch
-      } else {
-        // if multiple is enabled add this to selection
-        // otherwise single select
+
+      // deselect all if user did not click the checkbox
+      if (!e.target.classList.contains('checkbox-container')) { // clicked on checkbox
+        getTreeCtrl().deselectAll();
       }
+
+      getTreeCtrl().toggleSelect(!selected, getTreeCtrl().hashGetter($scope[$scope.repeatName]), $scope[$scope.repeatName]);
       e.stopPropagation();
     } else {
       toggleBranchClick(e);
-      e.stopPropagation();
     }
   }
 
@@ -316,6 +313,7 @@ function branchController($scope, $mdUtil, $animateCss) {
     if (!branchContainsElement(e.target)) { return; }
     if (isOpen !== true) { open(); }
     else { close(); }
+    e.stopPropagation();
   }
 
   function branchContainsElement(el) {

src/js/tree.js

@@ -39,6 +39,7 @@ function treeDirective($mdTheming, $mdUtil) {
     vm.registerBranch = registerBranch;
     vm.unregisterBranch = unregisterBranch;
     vm.toggleSelect = toggleSelect;
+    vm.deselectAll = deselectAll;
     vm.init = init;
     vm.hashGetter = hashGetter;
 
@@ -109,6 +110,9 @@ function treeDirective($mdTheming, $mdUtil) {
       refreshViewValue();
     }
 
+    function deselectAll() {
+      Object.keys(branches).forEach(deselect);
+    }
 
     function select(hashKey, hashedValue) {
       var branch = branches[hashKey];

src/style.scss

@@ -304,6 +304,7 @@ md-branch.md-checkbox-enabled > .md-branch-inner {
 
   // unchecked
   .checkbox-icon {
+    pointer-events: none;
     box-sizing: border-box;
     transition: 240ms;
     position: absolute;