Fix canUnselect category-list

Leonardo Merlin
1 parent 03995bff
Showing 1 changed file with 17 additions and 9 deletions Show diff stats
src/app/components/category-list/category-list.directive.js
@@ -30,27 +30,35 @@
       if(!vm.isCollapsed){
         vm.isCollapsed = false;
       }
+    };
+
+    CategoryListController.prototype._canUnselect = function() {
+      var vm = this;
-      if(angular.isUndefined(vm.canUnselect) || vm.canUnselect === null){
-        vm.canUnselect = true;
-      } else {
-        vm.canUnselect = !(vm.canUnselect == 'false');
+      if(vm.canUnselect && vm.canUnselect === 'false'){
+        return false;
       }
+
+      return true;
     };
+
     CategoryListController.prototype.selectCategory = function(category, $event) {
       var vm = this;
       // prevent glitch
       $event.stopPropagation();
-      if(!category && !vm.canUnselect){
-        vm.$log.info('Unselect is disabled.');
-        return;
-      }
-
       if (category !== vm.selectedCategory) {
         vm.selectedCategory = category;
+      }else{
+
+        if(!vm._canUnselect()){
+          vm.$log.info('Unselect is disabled.');
+          return;
+        }
+
+        vm.selectedCategory = null;
       }
       // send event to all controllers