Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Side nav scroll into view, script file rename #320

Merged
merged 3 commits into from
Jul 21, 2018
Merged

Side nav scroll into view, script file rename #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5f33db
refactor(jquery-js): scroll nav active item into view
damyanpetev Jul 20, 2018
7af5757
refactor(jquery-js): rename navigation script file
damyanpetev Jul 20, 2018
fe2c72c
Merge branch 'master' into AMarinov/IgniteNavigation
bazal4o Jul 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/templates/jQueryTemplate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
15 changes: 9 additions & 6 deletions ...s/empty/files/assets/navigation-header.js → ...projects/empty/files/assets/navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
});
2 changes: 1 addition & 1 deletion templates/jquery/js/projects/empty/files/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down