From 7cbce13667a3107bf346a568a2982f6704f3b752 Mon Sep 17 00:00:00 2001
From: Mayur Patel <mayur.mindinventory@gmail.com>
Date: Sun, 17 Apr 2016 23:46:05 +0530
Subject: [PATCH] Fixed Issue: #14

---
 src/app/theme/components/sidebar/SidebarCtrl.js | 6 +++---
 src/app/theme/components/sidebar/sidebar.html   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/theme/components/sidebar/SidebarCtrl.js b/src/app/theme/components/sidebar/SidebarCtrl.js
index 469e5aa..8cae635 100644
--- a/src/app/theme/components/sidebar/SidebarCtrl.js
+++ b/src/app/theme/components/sidebar/SidebarCtrl.js
@@ -17,7 +17,7 @@
     function selectMenuItem() {
       $.each($scope.menuItems, function (index, menu) {
         menu.selected = ('#' + $location.$$url).indexOf(menu.root) == 0;
-        menu.expanded = menu.expanded || menu.selected;
+        menu.expanded = menu.selected;
         if (menu.subMenu) {
           $.each(menu.subMenu, function (subIndex, subMenu) {
             subMenu.selected = (('#' + $location.$$url).indexOf(subMenu.root) == 0) && !subMenu.disabled;
@@ -26,8 +26,6 @@
       });
     }
 
-    selectMenuItem();
-
     $scope.$on('$locationChangeSuccess', function () {
       selectMenuItem();
     });
@@ -97,5 +95,7 @@
       var menuTopValue = 66;
       $scope.hoverElemTop = $event.currentTarget.getBoundingClientRect().top - menuTopValue;
     };
+
+    selectMenuItem();
   }
 })();
\ No newline at end of file
diff --git a/src/app/theme/components/sidebar/sidebar.html b/src/app/theme/components/sidebar/sidebar.html
index 878d4df..224afbb 100644
--- a/src/app/theme/components/sidebar/sidebar.html
+++ b/src/app/theme/components/sidebar/sidebar.html
@@ -2,13 +2,13 @@
        ng-mouseleave="hoverElemTop=selectElemTop">
   <ul class="al-sidebar-list" slimscroll="{height: '{{menuHeight}}px'}" slimscroll-watch="menuHeight" >
     <li ng-repeat="item in menuItems" class="al-sidebar-list-item"
-        ng-class="{'selected': item.selected, 'with-sub-menu': item.subMenu}">
+        ng-class="{'selected': item.selected, 'with-sub-menu': item.subMenu}" ng-click="item.expanded = !item.expanded">
 
       <a ng-mouseenter="hoverItem($event, item)" href="{{ item.root }}" ng-if="!item.subMenu" class="al-sidebar-list-link">
         <i class="{{ item.icon }}"></i><span>{{ item.title }}</span>
       </a>
 
-      <a ng-mouseenter="hoverItem($event, item)" ng-if="item.subMenu" href ng-click="toggleSubMenu($event, item)"
+      <a ng-mouseenter="hoverItem($event, item)" ng-if="item.subMenu" href
          class="al-sidebar-list-link">
         <i class="{{ item.icon }}"></i><span>{{ item.title }}</span>
         <b class="fa" ng-class="{'fa-angle-up': item.expanded, 'fa-angle-down': !item.expanded}"
@@ -17,8 +17,8 @@
 
       <ul ng-if="item.subMenu" class="al-sidebar-sublist"
           ng-class="{expanded: item.expanded, 'slide-right': item.slideRight}">
-        <li ng-repeat="subitem in item.subMenu" ng-class="{'selected': subitem.selected, 'with-sub-menu': subitem.subMenu}">
-          <a ng-mouseenter="hoverItem($event, item)" ng-if="subitem.subMenu" href ng-click="toggleSubMenu($event, subitem);"
+        <li ng-repeat="subitem in item.subMenu" ng-class="{'selected': subitem.selected, 'with-sub-menu': subitem.subMenu}" ng-click="subitem.expanded = !subitem.expanded">
+          <a ng-mouseenter="hoverItem($event, item)" ng-if="subitem.subMenu" href
              class="al-sidebar-list-link subitem-submenu-link"><span>{{ subitem.title }}</span>
             <b class="fa" ng-class="{'fa-angle-up': subitem.expanded, 'fa-angle-down': !subitem.expanded}"
                ng-if="subitem.subMenu"></b>