From a2d49ab586ac05a7cd29e3c45402f1cd0711efeb Mon Sep 17 00:00:00 2001 From: Vladimir Lugovsky Date: Fri, 13 May 2016 18:36:11 +0300 Subject: [PATCH] fix(sidebar): open sidebar if clicked on icons on semi-collapsed sidebar Closes #27 --- .../baSidebar/baSidebarHelpers.directive.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app/theme/components/baSidebar/baSidebarHelpers.directive.js b/src/app/theme/components/baSidebar/baSidebarHelpers.directive.js index c5b7fde..94127ea 100644 --- a/src/app/theme/components/baSidebar/baSidebarHelpers.directive.js +++ b/src/app/theme/components/baSidebar/baSidebarHelpers.directive.js @@ -118,13 +118,22 @@ } /** @ngInject */ - function baUiSrefToggler() { + function baUiSrefToggler(baSidebarService) { return { restrict: 'A', require: '^baSidebarTogglingItem', link: function(scope, el, attrs, baSidebarTogglingItem) { el.on('click', function() { - baSidebarTogglingItem.$toggle(); + if (baSidebarService.isMenuCollapsed()) { + // If the whole sidebar is collapsed and this item has submenu. We need to open sidebar. + // This should not affect mobiles, because on mobiles sidebar should be hidden at all + scope.$apply(function() { + baSidebarService.setMenuCollapsed(false); + }); + baSidebarTogglingItem.$expand(); + } else { + baSidebarTogglingItem.$toggle(); + } }); } };