From 2807c3ce6d389131f944cc4cc0a9acee6e33aa38 Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Sat, 17 Dec 2016 19:02:56 +0800
Subject: [PATCH] enhance judgement of active menu

---
 app/helpers.php                    | 11 ++++++++++-
 resources/assets/src/js/general.js |  6 +++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index 8f8a0ce3..c877177a 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -151,7 +151,16 @@ if (! function_exists('bs_menu')) {
         $content = "";
 
         foreach ($data as $key => $value) {
-            $content .= (app('request')->is(@$value['link'])) ? '<li class="active">' : '<li>';
+            $active = app('request')->is(@$value['link']);
+
+            // also set parent as active if any child is active
+            foreach ((array) @$value['children'] as $childKey => $childValue) {
+                if (app('request')->is(@$childValue['link'])) {
+                    $active = true;
+                }
+            }
+
+            $content .= $active ? '<li class="active">' : '<li>';
 
             if (isset($value['children'])) {
                 $content .= '<a href="#"><i class="fa '.$value['icon'].'"></i> <span>'.trans($value['title']).'</span><span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span></a>';
diff --git a/resources/assets/src/js/general.js b/resources/assets/src/js/general.js
index d5ef63e1..549f9bbc 100644
--- a/resources/assets/src/js/general.js
+++ b/resources/assets/src/js/general.js
@@ -2,7 +2,7 @@
 * @Author: printempw
 * @Date:   2016-09-15 10:39:41
 * @Last Modified by:   printempw
-* @Last Modified time: 2016-12-10 21:57:23
+* @Last Modified time: 2016-12-17 18:47:02
 */
 
 'use strict';
@@ -44,3 +44,7 @@ function do_logout(callback) {
         error: showAjaxError
     });
 }
+
+$(document).ready(function() {
+    $('li.active > ul').show();
+});