From c5f33dbbf7b1690615fa610e573921cb8668681a Mon Sep 17 00:00:00 2001 From: Damyan Petev Date: Fri, 20 Jul 2018 12:54:43 +0300 Subject: [PATCH 1/2] refactor(jquery-js): scroll nav active item into view --- .../js/projects/empty/files/assets/navigation-header.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/templates/jquery/js/projects/empty/files/assets/navigation-header.js b/templates/jquery/js/projects/empty/files/assets/navigation-header.js index e81c6baf1..fecf8c680 100644 --- a/templates/jquery/js/projects/empty/files/assets/navigation-header.js +++ b/templates/jquery/js/projects/empty/files/assets/navigation-header.js @@ -10,11 +10,10 @@ $(function () { path = path.slice(1); - result += "" - + result += ""; + for (var i = 0; i < igniteCLIViews.length; i++) { var navMenuClass = "nav-menu-item"; - var view = igniteCLIViews[i]; if(view.path === path) { navMenuClass += " active"; @@ -23,4 +22,8 @@ $(function () { } $("#list").append(result); + var $active = $("#list").children(".active"); + if ($active.length) { + $active.get(0).scrollIntoView(false); + } }); \ No newline at end of file From 7af57573efc9b49cd3084b87bc34fd8020ff3dea Mon Sep 17 00:00:00 2001 From: Damyan Petev Date: Fri, 20 Jul 2018 13:02:42 +0300 Subject: [PATCH 2/2] refactor(jquery-js): rename navigation script file --- lib/templates/jQueryTemplate.ts | 2 +- .../files/assets/{navigation-header.js => navigation.js} | 8 ++++---- templates/jquery/js/projects/empty/files/index.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename templates/jquery/js/projects/empty/files/assets/{navigation-header.js => navigation.js} (81%) diff --git a/lib/templates/jQueryTemplate.ts b/lib/templates/jQueryTemplate.ts index 5ad9d8ada..7b93a9382 100644 --- a/lib/templates/jQueryTemplate.ts +++ b/lib/templates/jQueryTemplate.ts @@ -123,7 +123,7 @@ export class jQueryTemplate implements Template { protected getNavigationScript(): string { let builder = ""; builder += ""; - builder += ""; + builder += ""; return builder; } diff --git a/templates/jquery/js/projects/empty/files/assets/navigation-header.js b/templates/jquery/js/projects/empty/files/assets/navigation.js similarity index 81% rename from templates/jquery/js/projects/empty/files/assets/navigation-header.js rename to templates/jquery/js/projects/empty/files/assets/navigation.js index fecf8c680..f96b6424c 100644 --- a/templates/jquery/js/projects/empty/files/assets/navigation-header.js +++ b/templates/jquery/js/projects/empty/files/assets/navigation.js @@ -1,8 +1,8 @@ /// $(function () { - var menu = "" - $('body').prepend(menu); + var $menu = $(""); + $menu.prependTo("body"); var result = ""; result += "
  • $(name)

  • "; @@ -21,8 +21,8 @@ $(function () { result += "
  • " + view.name + "
  • " } - $("#list").append(result); - var $active = $("#list").children(".active"); + $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 index dfa737b78..31b377273 100644 --- a/templates/jquery/js/projects/empty/files/index.html +++ b/templates/jquery/js/projects/empty/files/index.html @@ -7,7 +7,7 @@ - +