Merge pull request #320 from IgniteUI/AMarinov/IgniteNavigation

Side nav scroll into view, script file rename
IgniteUI · Jul 21, 2018 · b06b11a · b06b11a
2 parents 74aad35 + fe2c72c
commit b06b11a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/lib/templates/jQueryTemplate.ts b/lib/templates/jQueryTemplate.ts
@@ -121,7 +121,7 @@ export class jQueryTemplate implements Template {
 	protected getNavigationScript(): string {
 		let builder = "";
 		builder += "<script src=\"../ignite-cli-views.js\"></script>";
-		builder += "<script src=\"../assets/navigation-header.js\"></script>";
+		builder += "<script src=\"../assets/navigation.js\"></script>";
 
 		return builder;
 	}

diff --git a/...s/empty/files/assets/navigation-header.js → ...projects/empty/files/assets/navigation.js b/...s/empty/files/assets/navigation-header.js → ...projects/empty/files/assets/navigation.js
@@ -1,26 +1,29 @@
 /// <reference path="../ignite-cli-views.js" />
 
 $(function () {
-	var menu = "<ul id='list' class='nav-menu'></ul>"
-	$('body').prepend(menu);
+	var $menu = $("<ul id='list' class='nav-menu'></ul>");
+	$menu.prependTo("body");
 	var result = "";
 	result += "<li class=\"nav-menu-item-logo\"><h1>$(name)</h1></li>";
 
 	var path = window.location.pathname;
 	path = path.slice(1);
 
 
-	result += "<li class='nav-menu-item" + (path ? "" : " active") + "'><a href='/'>Home</a></li>"
-	
+	result += "<li class='nav-menu-item" + (path ? "" : " active") + "'><a href='/'>Home</a></li>";
+
 	for (var i = 0; i < igniteCLIViews.length; i++) {
 		var navMenuClass = "nav-menu-item";
-
 		var view = igniteCLIViews[i];
 		if(view.path === path) {
 			navMenuClass += " active"; 
 		}
 		result += "<li class=\"" + navMenuClass +"\"><a href='/" + view.path + "'>" + view.name + "</a></li>"
 	}
 
-	$("#list").append(result);
+	$menu.append(result);
+	var $active = $menu.children(".active");
+	if ($active.length) {
+		$active.get(0).scrollIntoView(false);
+	}
 });
diff --git a/templates/jquery/js/projects/empty/files/index.html b/templates/jquery/js/projects/empty/files/index.html
@@ -7,7 +7,7 @@
     <link href="assets/app.css" rel="stylesheet" />
     <!-- Navigation Header JavaScript Files -->
 	<script src="ignite-cli-views.js"></script>
-	<script src="assets/navigation-header.js"></script>
+	<script src="assets/navigation.js"></script>
 </head>
 <body>
 	<div class="content">