From 77f580bf1102acec96e381ecdb9f0342b6ce56c9 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Sun, 16 Dec 2018 17:49:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E8=88=AA=E6=A0=8F?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E6=9D=A1=E9=97=AE=E9=A2=98x2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layout/_partial/header.ejs | 8 ++++----
 source/js/app.js           | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/layout/_partial/header.ejs b/layout/_partial/header.ejs
index a69ce5f..9f9cbb7 100755
--- a/layout/_partial/header.ejs
+++ b/layout/_partial/header.ejs
@@ -7,7 +7,7 @@
             <% if (config.nav_menu) { %>
     					<% (config.nav_menu || []).forEach(function(value){ %>
     						<li>
-									<a id="<%= url_for(value.url).replace(/\//g, "") %>"
+									<a id="<%= url_for(value.url).replace(/\//g, "")?url_for(value.url).replace(/\//g, ""):"home" %>"
 									 class="nav flat-box" href="<%= url_for(value.url) %>">
 										<i class='<%=value.icon%> fa-fw'></i>&nbsp;<%=value.name%>
 									</a>
@@ -15,7 +15,7 @@
         			<%})%>
         		<% } %>
 					</ul>
-					
+
 				</div>
 
 			<% if (theme.search.enable === true) { %>
@@ -28,7 +28,7 @@
 			<% } %>
 			<ul class='switcher h-list'>
 				<% if (theme.search.enable === true) { %>
-					<li class='s-search'><a class="fas fa-search fa-fw" href='javascript:void(0)'></span></a></li>
+					<li class='s-search'><a class="fas fa-search fa-fw" href='javascript:void(0)'></a></li>
 				<% } %>
 				<li class='s-menu'><a class="fas fa-bars fa-fw" href='javascript:void(0)'></a></li>
 			</ul>
@@ -51,7 +51,7 @@
           <% if (config.nav_menu) { %>
               <% (config.nav_menu || []).forEach(function(value){ %>
                   <li>
-										<a id="<%= url_for(value.url).replace(/\//g, "") %>" class="nav flat-box" href="<%= url_for(value.url) %>">
+										<a id="<%= url_for(value.url).replace(/\//g, "")?url_for(value.url).replace(/\//g, ""):"home" %>" class="nav flat-box" href="<%= url_for(value.url) %>">
 											<i class='<%=value.icon%> fa-fw'></i>&nbsp;<%=value.name%>
 										</a>
                   </li>
diff --git a/source/js/app.js b/source/js/app.js
index e8b08f1..8bcdbbb 100755
--- a/source/js/app.js
+++ b/source/js/app.js
@@ -59,8 +59,12 @@ var customSearch;
 		}
 		//set current active nav
 		var $active_link = null;
-    $active_link = $('#' + location.pathname.replace(/\//g, ""), $headerMenu);
-		setUnderline($active_link, false);
+    var idname = location.pathname.replace(/\//g, "");
+    if (idname.length == 0) {
+      idname = "home";
+    }
+    $active_link = $('#' + idname, $headerMenu);
+    setUnderline($active_link, false);
 	}
 
 	function setHeaderMenuPhone() {