From 4a22ff5191c15e3881933d19be65b06644219502 Mon Sep 17 00:00:00 2001 From: Leonardo Merlin Date: Tue, 15 Sep 2015 14:05:11 -0300 Subject: [PATCH] Fix canUnselect category-list --- src/app/components/category-list/category-list.directive.js | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/app/components/category-list/category-list.directive.js b/src/app/components/category-list/category-list.directive.js index 4622663..56aecce 100644 --- a/src/app/components/category-list/category-list.directive.js +++ b/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 -- libgit2 0.21.2