From de27657196311d3a06ae4438323403b0ca90e845 Mon Sep 17 00:00:00 2001 From: "Collin J. Doering" Date: Mon, 8 Feb 2016 19:39:10 -0500 Subject: [PATCH] Fixed active nav item issue The navigation was working correctly before the javascript refactor, and seemed to be working correctly after as well, except when clicking on links to tag pages or posts from within #page-content. When an internal link to a post or tag page is clicked the navigation should set the "blog" menuitem to be active. Unfortunately, this was not the case before this commit but luckily this commit rectifies this. Signed-off-by: Collin J. Doering --- js/default.js | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/js/default.js b/js/default.js index d622da9..6c497b7 100644 --- a/js/default.js +++ b/js/default.js @@ -240,11 +240,7 @@ var _paq = _paq || []; }()), site = (function () { - var spec = { - init: init - }, - - status = (function () { + var status = (function () { var messages = [], validIndicators = ["error", "success", "info"], spec = { @@ -341,7 +337,13 @@ var _paq = _paq || []; }); return spec; - }()); + }()), + + spec = { + init: init, + nav: nav, + status: status + }; function appCacheUpdateReady () { window.applicationCache.swapCache(); @@ -366,11 +368,17 @@ var _paq = _paq || []; // Initialize routes router.route({ // Post pages handler - acceptUrls: /posts\/.*\.html/ + acceptUrls: /posts\/.*\.html/, + onSuccess: function (url, dta) { + site.nav.setActive('/blog1.html'); + } }); router.route({ // Tag pages handler - acceptUrls: /tags\/.*(\d*)\.html/ + acceptUrls: /tags\/.*(\d*)\.html/, + onSuccess: function (url, dta) { + site.nav.setActive('/blog1.html'); + } }); router.route({ // Blog pages handler