hdoc-tools 0.13.0 → 0.14.1

package/ui/js/doc.hornbill.js

@@ -5,133 +5,116 @@
 var jqContentContainer = null;
 var jqDocumentHeader = null;
 var jqLeftNav = null;
-var global = {stateParams:{},lastLayoutClass:""};    
+var global = { stateParams: {}, lastLayoutClass: "" };
 
 var docAppMethods = {
-    setSessionInfo:function(info)
-    {
+    setSessionInfo: function (info) {
         let self = this;
         self.docApp.userSession = info;
     },
-    switchViewTheme:function()
-    {
-        if(ThemePreference)document.documentElement.classList.remove(ThemePreference);
+    switchViewTheme: function () {
+        if (ThemePreference) document.documentElement.classList.remove(ThemePreference);
 
-        if(ThemePreference === 'dark')
-        {
+        if (ThemePreference === 'dark') {
             ThemePreference = 'light';
         }
-        else{
+        else {
             ThemePreference = 'dark';
         }
 
-        localStorage.setItem('hdocbook-theme-appearance',ThemePreference);
+        localStorage.setItem('hdocbook-theme-appearance', ThemePreference);
         document.documentElement.classList.add(ThemePreference);
     },
-    renderNavigation:function()
-    {
+    renderNavigation: function () {
         let self = this;
         self.docApp.navSections = self.docApp.book.navigation.items; //-- show be an array of nav groups
+
     },
-    toggleMobileMenu:function()
-    {
+    toggleMobileMenu: function () {
         let isOpen = $(".mobile-menu-btn").data("isopen");
-        if(isOpen)
-        {
+        if (isOpen) {
             $(".DocSidebar").removeClass("open");
         }
-        else
-        {
+        else {
             $(".DocSidebar").addClass("open");
         }
         //-- store new mode
-        $(".mobile-menu-btn").data("isopen",!isOpen);
+        $(".mobile-menu-btn").data("isopen", !isOpen);
     },
-    resetMobileMenu:function(ev)
-    {
-        if( ev && ($(ev.srcElement).hasClass("mobile-menu-btn")[0] || $(ev.srcElement).closest(".mobile-menu-btn")[0]) )
-        {
+    resetMobileMenu: function (ev) {
+        if (ev && ($(ev.srcElement).hasClass("mobile-menu-btn")[0] || $(ev.srcElement).closest(".mobile-menu-btn")[0])) {
             //-- skp as have clikc no menu btn
         }
-        else
-        {
-            $(".mobile-menu-btn").data("isopen",false);
+        else {
+            $(".mobile-menu-btn").data("isopen", false);
             $(".DocSidebar").removeClass("open");
         }
     }
-    
+
 };
 
- 
- //--
- //-- user clicked back or forwards
- window.addEventListener('popstate', function (event) 
- {
+
+//--
+//-- user clicked back or forwards
+window.addEventListener('popstate', function (event) {
     const loadUrl = new URL(event.target.location.href);
-    loadContentUrl(loadUrl.pathname + loadUrl.hash,{},false,true);
+    loadContentUrl(loadUrl.pathname + loadUrl.hash, {}, false, true);
 });
 
 
 //--- GLOBAL FUNCTIONS
 function removeTrailingSlash(str) {
     return str.endsWith('/') ? str.slice(0, -1) : str;
-} 
+}
 function removeStartingSlash(str) {
     return str.startsWith('/') ? str.slice(1, str.length) : str;
 
     //if(linkRef.indexOf("/")===0)linkRef = linkRef.replace("/","");
-} 
+}
 
 function toSeoUrl(url) {
     return url.toString()               // Convert to string
         .normalize('NFD')               // Change diacritics
-        .replace(/[\u0300-\u036f]/g,'') // Remove illegal characters
-        .replace(/\s+/g,'-')            // Change whitespace to dashes
+        .replace(/[\u0300-\u036f]/g, '') // Remove illegal characters
+        .replace(/\s+/g, '-')            // Change whitespace to dashes
         .toLowerCase()                  // Change to lowercase
-        .replace(/&/g,'-and-')          // Replace ampersand
-        .replace(/[^a-z0-9\-]/g,'')     // Remove anything that is not a letter, number or dash
-        .replace(/-+/g,'-')             // Remove duplicate dashes
-        .replace(/^-*/,'')              // Remove starting dashes
-        .replace(/-*$/,'');             // Remove trailing dashes
+        .replace(/&/g, '-and-')          // Replace ampersand
+        .replace(/[^a-z0-9\-]/g, '')     // Remove anything that is not a letter, number or dash
+        .replace(/-+/g, '-')             // Remove duplicate dashes
+        .replace(/^-*/, '')              // Remove starting dashes
+        .replace(/-*$/, '');             // Remove trailing dashes
 }
 
-function listenForHrefClicks()
-{
+function listenForHrefClicks() {
     //-- trap all link click events - we want to handle links so can cancel and load content ourselves
-    $("A").off("click").on("click", function(ev)
-    {
-        let ele =  this;
-        if(ele.href)
-        {
+    $("A").off("click").on("click", function (ev) {
+        let ele = this;
+        if (ele.href) {
             const checkUrl = new URL(ele.href);
 
             view.resetMobileMenu();
 
             //-- clicking on a hash tag header link element - so jsut scroll to element
-            if(checkUrl.origin +"/"===siteBaseLocation)
-            {
+            if (checkUrl.origin + "/" === siteBaseLocation) {
                 //-- if a url that is part of this doc site then handle loading content inline else let link do whatever (i.e. its an external link)                
                 ev.stopImmediatePropagation();
-                ev.preventDefault();                
+                ev.preventDefault();
 
                 //-- do we need to scroll into view element on this page
-                if(checkUrl.hash && getAnchorFromHash(checkUrl.hash,"faq-toc-item"))
-                {
-                    let eleAnc = getAnchorFromHash(checkUrl.hash,"faq-toc-item");
-                    if(eleAnc[0] && eleAnc[0].scrollIntoView)scrollIntoView[0].scrollIntoView();
-                    
-                    if(ele.href!==document.location.href) window.history.pushState(null, null, ele.href); //-- user has clicked a link so we want to add state to history so we can click back                
+                if (checkUrl.hash && getAnchorFromHash(checkUrl.hash, "faq-toc-item")) {
+                    let eleAnc = getAnchorFromHash(checkUrl.hash, "faq-toc-item");
+                    if (eleAnc[0] && eleAnc[0].scrollIntoView) scrollIntoView[0].scrollIntoView();
+
+                    if (ele.href !== document.location.href) window.history.pushState(null, null, ele.href); //-- user has clicked a link so we want to add state to history so we can click back                
                 }
-                else
-                {                
-                    loadContentUrl(ele.getAttribute("href"),false,false);
+                else {
+                    loadContentUrl(ele.getAttribute("href"), false, false);
                 }
                 return false;
             }
-            else
-            {
+            else {
                 //-- if not part of this website then always open in new tab as considered an external site
-                ele.setAttribute("target","_blank");
+                ele.setAttribute("target", "_blank");
             }
         }
     });
@@ -140,45 +123,38 @@ function listenForHrefClicks()
 
 //-- based on content url highlight match navigation menu item
 //-- based on content url highlight match navigation menu item
-function highlightNavigationLinkFromUrl(matchLinkHref)
-{
-    
+function highlightNavigationLinkFromUrl(matchLinkHref) {
+
     matchLinkHref = removeStartingSlash(matchLinkHref).split("#")[0]; //-- remvoe # link
     $('a.DocLink').removeClass("active");
-    
+
     let arrItems = document.querySelectorAll('a.DocLink');
-    
-    for(let x=0;x<arrItems.length;x++)
-    {       
+
+    for (let x = 0; x < arrItems.length; x++) {
         let checkUrl = null;
-        try{
+        try {
             checkUrl = new URL(el.href);
         }
-        catch(e)
-        {
+        catch (e) {
             //hslDocLog.log("BAD navigation menu item found",el);
         }
 
-        if(checkUrl)
-        {
+        if (checkUrl) {
             //hslDocLog.log(checkUrl.pathname,matchLinkHref)
             let testCurrPath = removeStartingSlash(checkUrl.pathname);
-            if(testCurrPath===matchLinkHref)
-            {
+            if (testCurrPath === matchLinkHref) {
                 //-- exact match
                 $(el).addClass("active")
                 el.scrollIntoView();
                 return false;//break out
             }
-            else if(testCurrPath.indexOf(matchLinkHref)===0)
-            {
+            else if (testCurrPath.indexOf(matchLinkHref) === 0) {
                 //-- 
                 $(el).addClass("active")
                 el.scrollIntoView();
                 return false;//break out
             }
-            else if(matchLinkHref.indexOf(removeStartingSlash(checkUrl.pathname) + "/")===0)
-            {
+            else if (matchLinkHref.indexOf(removeStartingSlash(checkUrl.pathname) + "/") === 0) {
                 $(el).addClass("active");
                 el.scrollIntoView();
                 return false;//break out
@@ -187,25 +163,21 @@ function highlightNavigationLinkFromUrl(matchLinkHref)
     }
 }
 
-function getAnchorFromHash(strHash,strHasClass)
-{
-    try{
-        let strSelector = toSeoUrl(strHash.replace("#",""));
-        if(strHasClass)strSelector += "." + strHasClass;
+function getAnchorFromHash(strHash, strHasClass) {
+    try {
+        let strSelector = toSeoUrl(strHash.replace("#", ""));
+        if (strHasClass) strSelector += "." + strHasClass;
 
-        let jqEle = $("#"+strSelector);
-        if(jqEle[0])
-        {
+        let jqEle = $("#" + strSelector);
+        if (jqEle[0]) {
             return jqEle;
         }
-        else
-        {
+        else {
             return null;
         }
     }
-    catch(e)
-    {
-        hslDocLog.log("Get document anchor element by hash failed ["+strHash+"]",e);
+    catch (e) {
+        hslDocLog.log("Get document anchor element by hash failed [" + strHash + "]", e);
         return null;
     }
 
@@ -214,55 +186,47 @@ function getAnchorFromHash(strHash,strHasClass)
 
 //-- create items to stick in toc from current loaded content
 //-- searches for H2,H3
-function generateTableOfContentsFromDoc()
-{
+function generateTableOfContentsFromDoc() {
     let container = jqContentContainer[0];
-    if(container)
-    {
+    if (container) {
         const currUrl = new URL(document.location.href);
         view.docApp.tableOfContents = [];
-        for (let i=2; i<=3; i++) 
-        {
-            let headers = container.getElementsByTagName("h"+i);
-            for (let j=0; j<headers.length; j++) 
-            {
+        for (let i = 2; i <= 3; i++) {
+            let headers = container.getElementsByTagName("h" + i);
+            for (let j = 0; j < headers.length; j++) {
                 let jqCurrHeader = $(headers[j]);
                 //-- only process headers that do not have this class
-                if(!jqCurrHeader.hasClass("no-auto-anchor")) jqCurrHeader.addClass("faq-toc-item");
+                if (!jqCurrHeader.hasClass("no-auto-anchor")) jqCurrHeader.addClass("faq-toc-item");
             }
         }
 
         var headersTocItem = container.getElementsByClassName("faq-toc-item");
-        for (let k = 0; k < headersTocItem.length; k++) 
-        {
+        for (let k = 0; k < headersTocItem.length; k++) {
             let item = headersTocItem[k];
             let strLabel = $.trim(item.innerText);
-            if(strLabel)
-            {
+            if (strLabel) {
                 let seoSafeId = toSeoUrl(strLabel); //-- will use SEO to set in url so can scroll to element from url
-                let linkUrl = currUrl.pathname + "#" + seoSafeId;                
+                let linkUrl = currUrl.pathname + "#" + seoSafeId;
                 item.id = seoSafeId;
 
-                view.docApp.tableOfContents.push({ele:item,eleText:strLabel,tagName:item.tagName,href:linkUrl});
+                view.docApp.tableOfContents.push({ ele: item, eleText: strLabel, tagName: item.tagName, href: linkUrl });
 
                 //-- add link icon to header (using seo id)
                 $(item).append("<a class='header-anchor'><i class='bi bi-link'></i></a>");
-                $(item).find("a").attr("href",linkUrl);
-                
+                $(item).find("a").attr("href", linkUrl);
+
             }
         }
     }
 }
 
 
-function loadContentUrl(linkRef,fromPageRefresh,fromPopState)
-{
+function loadContentUrl(linkRef, fromPageRefresh, fromPopState) {
     //-- clear table of contents
     view.docApp.tableOfContents = [];
 
-    if(linkRef.indexOf(window.location.origin +"/")===0)
-    {
-        linkRef = linkRef.replace(window.location.origin  +"/","");
+    if (linkRef.indexOf(window.location.origin + "/") === 0) {
+        linkRef = linkRef.replace(window.location.origin + "/", "");
     }
 
     //-- remove trailing / if has one
@@ -271,7 +235,7 @@ function loadContentUrl(linkRef,fromPageRefresh,fromPopState)
     linkRef = removeStartingSlash(linkRef);
 
     //-- update url in browser
-    setBrowserViewUrl(linkRef,{},fromPageRefresh,fromPopState);
+    setBrowserViewUrl(linkRef, {}, fromPageRefresh, fromPopState);
 
     //-- destroy any existing content children and events properly
     jqContentContainer.empty();
@@ -279,53 +243,47 @@ function loadContentUrl(linkRef,fromPageRefresh,fromPopState)
 
     //-- for now just load whatever the href prop is (we can add actions to perform specific processing and then load content based on element atts etc)
     let frontmatterData = {};
-    let booksLinkRef = linkRef.includes('_books/') ? linkRef : "_books/"+linkRef;
-    fetch(booksLinkRef).then(response =>
-    { 
-        if(response.headers.has("X-frontmatter"))
-        {
+    let booksLinkRef = linkRef.includes('_books/') ? linkRef : "_books/" + linkRef;
+    fetch(booksLinkRef).then(response => {
+        if (response.headers.has("X-frontmatter")) {
             frontmatterData = response.headers.get("X-frontmatter");
             frontmatterData = JSON.parse(atob(frontmatterData));
         }
         return response.text();
-    }).then(html => 
-    {
+    }).then(html => {
         jqContentContainer.html(html);
 
         //-- remove previous layoutclass if have one
-        if(global.lastLayoutClass)
-        {
+        if (global.lastLayoutClass) {
             $("#DocContent").removeClass(global.lastLayoutClass);
             global.lastLayoutClass = "";
         }
 
         //-- if have layoutclass add it to content container - this is so we can specify table list view sizes etc
-        if(frontmatterData.layout)
-        {
+        if (frontmatterData.layout) {
             $("#DocContent").addClass(frontmatterData.layout);
             global.lastLayoutClass = frontmatterData.layout;
         }
 
         //--generate toc for all layouts that have h2/h3 
         view.docApp.keepTocLayout = (frontmatterData.layout == "article-no-toc");
-        if(!frontmatterData.layout || frontmatterData.layout==="article" || frontmatterData.layout==="article-toc")
-        {
+        if (!frontmatterData.layout || frontmatterData.layout === "article" || frontmatterData.layout === "article-toc") {
             view.docApp.keepTocLayout = true;
             generateTableOfContentsFromDoc();
         }
 
         //-- find any <tabs> and andd a bootstrap tab item strip
-        $("#DocContent").find('tabs').each((idx,el) => {
+        $("#DocContent").find('tabs').each((idx, el) => {
             let tabClass = el.getAttribute("tabstyle");
             let tabMarkup = "<ul class='nav nav-tabs'>";
             //-- for each tab we need to create a tab link
-            $(el).find("tab").each((idx,aTab) => {
+            $(el).find("tab").each((idx, aTab) => {
 
-                let activeClass=(idx===0)?" active":"";
+                let activeClass = (idx === 0) ? " active" : "";
                 tabMarkup += `<li class='nav-item c-pointer' contentidx='${idx}'><span class='nav-link${activeClass}'>${aTab.getAttribute("name")}</span></li>`;
 
                 //-- hide the tab element if it is not the active one (first)
-                if(idx>0)$(aTab).addClass("d-none");
+                if (idx > 0) $(aTab).addClass("d-none");
 
             });
 
@@ -334,36 +292,33 @@ function loadContentUrl(linkRef,fromPageRefresh,fromPopState)
             $(el).prepend(tabMarkup).find(".nav.nav-tabs").addClass(tabClass);
 
             //-- add event handler for switching tab items
-            $(el).find("li").off("click").on("click",function()
-            {
+            $(el).find("li").off("click").on("click", function () {
                 let contentIdx = this.getAttribute('contentidx');
                 let tabsContainer = $(this).closest("tabs").eq(0);
-                let tabs= tabsContainer.find("tab");
-                
+                let tabs = tabsContainer.find("tab");
+
                 //-- hide other tab content and show this tabs content
                 tabs.addClass("d-none");
-                tabs.eq(contentIdx-0).removeClass("d-none");
+                tabs.eq(contentIdx - 0).removeClass("d-none");
 
                 //-- set clicked tab item to active
                 tabsContainer.find(".nav-link").removeClass("active");
                 $(this).find(".nav-link").addClass("active");
-                
+
             });
         });
 
 
         //-- do any code highlighting
-        if(hljs)
-        {
+        if (hljs) {
             document.querySelectorAll('pre code').forEach((el) => {
                 hljs.highlightBlock(el);
             });
         }
-        else
-        {
+        else {
             hslDocLog.log("code highlighting js could not be loaded. code block highlighting will not be enabled");
         }
-        
+
         //-- show copy button by any code blocks
         var options = {
             contentSelector: ".injected-document-content",
@@ -371,7 +326,7 @@ function loadContentUrl(linkRef,fromPageRefresh,fromPopState)
             // Use if you need to time highlighting and badge application
             // since the badges need to be applied afterwards.
             // 0 - direct execution (ie. you handle timing
-            loadDelay:0,
+            loadDelay: 0,
 
             // CSS class(es) used to render the copy icon.
             copyIconClass: "bi bi-clipboard",
@@ -379,7 +334,7 @@ function loadContentUrl(linkRef,fromPageRefresh,fromPopState)
             checkIconClass: "bi bi-clipboard-check --htl-c-brand",
 
             // intercept text copying - passed in text return text out
-            onBeforeCodeCopied: function(text) {                
+            onBeforeCodeCopied: function (text) {
                 return text;
             }
         };
@@ -388,27 +343,24 @@ function loadContentUrl(linkRef,fromPageRefresh,fromPopState)
 
         //-- get first H1 and put it into our header section header
         let docHeader = jqContentContainer.find("H1").eq(0)
-        jqDocumentHeader.find(".document-title").append( docHeader );
+        jqDocumentHeader.find(".document-title").append(docHeader);
 
 
         setGitHubBookUrl(linkRef);
 
 
         //-- make sure selected link parents are set to .expand=true
-        if(expandNavParentSectionBySelectedLinkHref(linkRef))
-        {
+        if (expandNavParentSectionBySelectedLinkHref(linkRef)) {
             view.updateCounter++;
-            view.$nextTick(function()
-            {
+            view.$nextTick(function () {
                 //-- find any navigation links that match url and highlight
-//                listenForHrefClicks();
-                highlightNavigationLinkFromUrl(linkRef);   
+                //                listenForHrefClicks();
+                highlightNavigationLinkFromUrl(linkRef);
 
                 //-- scroll to element that match hash (if have one)
-                if(document.location.hash)
-                {
-                    let gotoEle = getAnchorFromHash(document.location.hash) ;
-                    if(gotoEle)gotoEle[0].scrollIntoView();
+                if (document.location.hash) {
+                    let gotoEle = getAnchorFromHash(document.location.hash);
+                    if (gotoEle) gotoEle[0].scrollIntoView();
                 }
             });
             view.$forceUpdate();
@@ -418,76 +370,60 @@ function loadContentUrl(linkRef,fromPageRefresh,fromPopState)
     });
 }
 
-function setGitHubBookUrl(linkRef)
-{
+function setGitHubBookUrl(linkRef) {
     let bookRef = linkRef.split(siteBaseLocation);
-    bookRef = (bookRef[1])?bookRef[1]:bookRef[0];
+    bookRef = (bookRef[1]) ? bookRef[1] : bookRef[0];
     let bookId = bookRef.split("/")[0];
     view.docApp.documentGithubUrl = "https://github.com/Hornbill-Docs/" + bookId + "/blob/main/" + bookRef + ".md";
     //--https://github.com/Hornbill-Docs/hdoc-guide/blob/main/hdoc-guide/overview.md
 }
 
-function loadBookDefaultLink()
-{
+function loadBookDefaultLink() {
     $(".DocLink.link").first().click();
 }
 
-function findFirstClickableBookLink(findByLinkRef,currentNavSection)
-{
-    if(currentNavSection === undefined) 
+function findFirstClickableBookLink(findByLinkRef, currentNavSection) {
+    if (currentNavSection === undefined)
         currentNavSection = view.docApp.navSections;
 
 
-    for(let x=0;x<currentNavSection.length;x++)
-    {
-        if(currentNavSection[x].items)
-        {
-            let clickableItem = findFirstClickableBookLink(findByLinkRef,currentNavSection[x].items);
-            if(clickableItem)
-            {
+    for (let x = 0; x < currentNavSection.length; x++) {
+        if (currentNavSection[x].items) {
+            let clickableItem = findFirstClickableBookLink(findByLinkRef, currentNavSection[x].items);
+            if (clickableItem) {
                 return clickableItem;
             }
         }
-        else if(currentNavSection[x].link)
-        {
-            if(findByLinkRef)
-            {               
-                if(removeStartingSlash(removeTrailingSlash(currentNavSection[x].link)) == findByLinkRef)  return currentNavSection[x].link;
+        else if (currentNavSection[x].link) {
+            if (findByLinkRef) {
+                if (removeStartingSlash(removeTrailingSlash(currentNavSection[x].link)) == findByLinkRef) return currentNavSection[x].link;
             }
-            else 
-            {
+            else {
                 return currentNavSection[x].link;
             }
         }
-    }    
+    }
 }
 
-function expandNavParentSectionBySelectedLinkHref(findByLinkRef, currentNavSection)
-{
+function expandNavParentSectionBySelectedLinkHref(findByLinkRef, currentNavSection) {
     findByLinkRef = findByLinkRef.split("#")[0];
-    if(currentNavSection === undefined) 
-    {
+    if (currentNavSection === undefined) {
         view.docApp.bookBreadCrumb = [];        //-- reset bread crumb
         currentNavSection = view.docApp.navSections;
     }
-    
-    for(let x=0;x<currentNavSection.length;x++)
-    {
-        if(currentNavSection[x].items)
-        {
-            let res = expandNavParentSectionBySelectedLinkHref(findByLinkRef,currentNavSection[x].items);
-            if(res)
-            {
-                currentNavSection[x].expand=true;
-                view.docApp.bookBreadCrumb.unshift({title:currentNavSection[x].text,link:currentNavSection[x].items[0].link});
+
+    for (let x = 0; x < currentNavSection.length; x++) {
+        if (currentNavSection[x].items) {
+            let res = expandNavParentSectionBySelectedLinkHref(findByLinkRef, currentNavSection[x].items);
+            if (res) {
+                currentNavSection[x].expand = true;
+                view.docApp.bookBreadCrumb.unshift({ title: currentNavSection[x].text, link: currentNavSection[x].items[0].link });
                 return res;
             }
         }
-        else
-        {
+        else {
             //-- check item to see if it matches url
-            if(removeStartingSlash(removeTrailingSlash(currentNavSection[x].link)) == findByLinkRef)
-            {
+            if (removeStartingSlash(removeTrailingSlash(currentNavSection[x].link)) == findByLinkRef) {
                 return true;
             }
         }
@@ -496,29 +432,23 @@ function expandNavParentSectionBySelectedLinkHref(findByLinkRef, currentNavSecti
 }
 
 
-function old_expandNavParentSectionBySelectedLinkHref(findByLinkRef, currentNavSection)
-{
+function old_expandNavParentSectionBySelectedLinkHref(findByLinkRef, currentNavSection) {
     findByLinkRef = findByLinkRef.split("#")[0];
-    if(currentNavSection === undefined) 
+    if (currentNavSection === undefined)
         currentNavSection = view.docApp.navSections;
 
 
-    for(let x=0;x<currentNavSection.length;x++)
-    {
-        if(currentNavSection[x].items)
-        {
-            let res = expandNavParentSectionBySelectedLinkHref(findByLinkRef,currentNavSection[x].items);
-            if(res)
-            {
-                currentNavSection[x].expand=true;
+    for (let x = 0; x < currentNavSection.length; x++) {
+        if (currentNavSection[x].items) {
+            let res = expandNavParentSectionBySelectedLinkHref(findByLinkRef, currentNavSection[x].items);
+            if (res) {
+                currentNavSection[x].expand = true;
                 return res;
             }
         }
-        else
-        {
+        else {
             //-- check item to see if it matches url
-            if(removeStartingSlash(removeTrailingSlash(currentNavSection[x].link)) == findByLinkRef)
-            {
+            if (removeStartingSlash(removeTrailingSlash(currentNavSection[x].link)) == findByLinkRef) {
                 return true;
             }
         }
@@ -526,106 +456,91 @@ function old_expandNavParentSectionBySelectedLinkHref(findByLinkRef, currentNavS
 
 }
 
-function setBrowserViewUrl(strHrefToLoad,viewData,fromPageRefresh,fromPopState)
-{
-   
-   let urlToSet = window.location.origin + "/" + strHrefToLoad;
-   const url = new URL(urlToSet);
-   
-   //-- remove any old params
-   for(let strKey in global.stateParams)
-   {
-       url.searchParams.delete(strKey);
-   }
-
-   //-- now set new data params in url
-   for(let strKey in viewData)
-   {
-       url.searchParams.set(strKey,viewData[strKey]);
-   }    
-
-   //-- store global params
-   global.stateParams = viewData;
-
-   if(!fromPopState)
-   {
-     if(fromPageRefresh)
-     {
-       window.history.replaceState(null, null, url); //-- user has refreshed page or jsut visited page
-     }
-     else
-     {
-       window.history.pushState(null, null, url); //-- user has clicked a link so we want to add state to history so we can click back
-     }
-   }
+function setBrowserViewUrl(strHrefToLoad, viewData, fromPageRefresh, fromPopState) {
+
+    let urlToSet = window.location.origin + "/" + strHrefToLoad;
+    const url = new URL(urlToSet);
+
+    //-- remove any old params
+    for (let strKey in global.stateParams) {
+        url.searchParams.delete(strKey);
+    }
+
+    //-- now set new data params in url
+    for (let strKey in viewData) {
+        url.searchParams.set(strKey, viewData[strKey]);
+    }
+
+    //-- store global params
+    global.stateParams = viewData;
+
+    if (!fromPopState) {
+        if (fromPageRefresh) {
+            window.history.replaceState(null, null, url); //-- user has refreshed page or jsut visited page
+        }
+        else {
+            window.history.pushState(null, null, url); //-- user has clicked a link so we want to add state to history so we can click back
+        }
+    }
 
 }
 
-async function fetchContentFile(strFilePath)
-{
-  return await fetch(strFilePath).then(response => response.text()).then(fileContent => 
-  {
-    return fileContent;
-  });
+async function fetchContentFile(strFilePath) {
+    return await fetch(strFilePath).then(response => response.text()).then(fileContent => {
+        return fileContent;
+    });
 }
 
-async function fetchJsonFile(strFilePath)
-{
-  return await fetch(strFilePath).then(response => response.json()).then(jsonObject => 
-  {
-    return jsonObject;
-  });
+async function fetchJsonFile(strFilePath) {
+    return await fetch(strFilePath).then(response => response.json()).then(jsonObject => {
+        return jsonObject;
+    });
 }
 
 
 //-- THE INIT APP CALLED FROM index.html
-$(".document-body").attr("v-pre","");
+$(".document-body").attr("v-pre", "");
 
 var view = new Vue({
     el: '#vDocDevApp',
-    data: {userSession:{},updateCounter:0,bookId:"", docApp:{keepTocLayout:false,book:{},navSections:[],tableOfContents:[],bookBreadCrumb:[]}},
-    methods:docAppMethods,
+    data: { userSession: {}, updateCounter: 0, bookId: "", docApp: { keepTocLayout: false, book: {}, navSections: [], tableOfContents: [], bookBreadCrumb: [] } },
+    methods: docAppMethods,
     directives: {
-       somedirectivename: {
-            bind (el, binding, vnode) {
+        somedirectivename: {
+            bind(el, binding, vnode) {
                 //-- do something when created on element
             }
         }
-    } ,
-    mounted:function()
-    {
+    },
+    mounted: function () {
 
-    }       
+    }
 });
 
 //-- repeatable conmponent for nav sections
 Vue.component('nav-section-component', {
     props: ['asection'],
     template: '#nav-section-template',
-    methods:{
-        toggleNavCollapse:function(navSection)
-        {
-            navSection.expand=!navSection.expand;
+    methods: {
+        toggleNavCollapse: function (navSection) {
+            navSection.expand = !navSection.expand;
             this.$forceUpdate();
-        }    
+        }
     }
- });
+});
 
 
- var hslDocLog={
-    _entry:[],
-    log:function(strMessage,varData)
-    {
-        if(varData!==undefined) console.log(strMessage,varData)
-        else  console.log(strMessage);
+var hslDocLog = {
+    _entry: [],
+    log: function (strMessage, varData) {
+        if (varData !== undefined) console.log(strMessage, varData)
+        else console.log(strMessage);
 
-        this._entry.push({msg:strMessage,data:varData})
+        this._entry.push({ msg: strMessage, data: varData })
     },
-    dump:function()
-    {
-        for(let x=0;x<this._entry.length;x++)
-        {
-            console.log(this._entry[x].msg,this._entry[x].data || null);
+    dump: function () {
+        for (let x = 0; x < this._entry.length; x++) {
+            console.log(this._entry[x].msg, this._entry[x].data || null);
         }
     }
 }
@@ -636,7 +551,7 @@ async function intialiseApp() {
     $(".theme-switch-checkbox").prop('checked', (ThemePreference === 'dark'));
 
     jqDocumentHeader = $(".injected-document-content .document-header");
-    jqContentContainer = $(".injected-document-content .document-body");    
+    jqContentContainer = $(".injected-document-content .document-body");
     //jqContentContainer = $(".injected-document-content");
     jqLeftNav = $("#DocSidebarNav");
 
@@ -656,61 +571,60 @@ async function intialiseApp() {
     dummyResponse.expiresDateTime = new Date(dummyResponse.validUntil).toLocaleDateString() + ' ' + new Date(dummyResponse.validUntil).toLocaleTimeString();
     */
 
-    fetchJsonFile("_api/session/").then(function(sessionData)
-    {  
-        hslDocLog.log("Hornbill docs get session data response",sessionData)
-        if(sessionData && sessionData.type==="user")
-        {
+    fetchJsonFile("_api/session/").then(function (sessionData) {
+        hslDocLog.log("Hornbill docs get session data response", sessionData)
+        if (sessionData && sessionData.type === "user") {
             hslDocLog.log("Hornbill docs set session set expires date time to browser locale")
             sessionData.expiresDateTime = new Date(sessionData.validUntil).toLocaleDateString() + ' ' + new Date(sessionData.validUntil).toLocaleTimeString();
-            hslDocLog.log("Hornbill docs update vue session object model",sessionData);
+            hslDocLog.log("Hornbill docs update vue session object model", sessionData);
             view.setSessionInfo(sessionData);
         }
     });
 
     //-- eof session stuff
 
-    await fetchJsonFile("_books/library.json").then(function(data){
+    await fetchJsonFile("_books/library.json").then(function (data) {
 
         // Get docbook library list
         view.docApp.library = data;
         view.docId = view.docApp.library.books[0].docId;
 
-    }).then(function(){
+    }).then(function () {
         // Get hdocbook.json
-        fetchJsonFile("_books/" + view.docId + "/hdocbook.json").then(function(data)
-        {
+        fetchJsonFile("_books/" + view.docId + "/hdocbook.json").then(function (data) {
+            console.log(view.docApp.library.books[0].nav_inline)
             view.docApp.book = data;
             view.bookId = data.docId;
             view.docApp.title = data.title || "";
             view.docApp.description = data.description || "";
+
+            if (view.docApp.library.books[0].nav_inline.text)
+                view.docApp.book.navigation.items.push(view.docApp.library.books[0].nav_inline);
+
             //-- now render out the nav menu
             view.renderNavigation();
-    
-    
-            setTimeout(function()
-            {               
+
+
+            setTimeout(function () {
                 listenForHrefClicks();
-    
+
                 //-- check if url is not root - in which case we need to load content for url
-                var initialLoadContentHref = window.location.href.replace(window.location.origin+"/","");
+                var initialLoadContentHref = window.location.href.replace(window.location.origin + "/", "");
                 initialLoadContentHref = findFirstClickableBookLink(initialLoadContentHref);
-                
-                if(initialLoadContentHref)
-                {
+
+                if (initialLoadContentHref) {
                     //-- find the link we are going to show and make sure parent/s are set to .expand=true
-                    loadContentUrl(initialLoadContentHref,true,false);
-                
-    
+                    loadContentUrl(initialLoadContentHref, true, false);
+
+
                 }
-                else
-                {
+                else {
                     hslDocLog.log("initial first view link to laod is not present");
                 }
 
                 $(".hb-hidden").removeClass("hb-hidden");
-                
-            },200);
+
+            }, 200);
         });
     });
- }
+}