hdoc-tools 0.7.4 → 0.7.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hdoc-tools",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "Hornbill HDocBook Development Support Tool",
   "main": "hdoc.js",
   "bin": {

package/ui/css/theme-default/styles/components/sidebar.css

@@ -66,10 +66,16 @@
     padding: 0 20px 20px;
   }
 
+  .DocSidebar .nogrouplink {
+    padding-top: 10px;
+    padding-bottom: 0px;
+  }
+
+
   .DocSidebar .group {
-    margin-top: 5px;
+    margin-top: 0px;
     margin-bottom: 5px;
-    padding-top: 10px;
+    padding-top: 5px;
   }
 
   .DocSidebar .group + .group {

package/ui/index.html

@@ -161,7 +161,7 @@
             <aside class="DocSidebar hb-container-vertical">
 
                 <nav class="nav hb-container-expand" id="DocSidebarNav" aria-labelledby="sidebar-aria-label" tabindex="-1">
-                    <div v-for="(navSection,index) in docApp.navSections" class="group">
+                    <div v-for="(navSection,index) in docApp.navSections"  v-bind:class="{'group':navSection.items, 'nogrouplink':!navSection.items}">
 					
 						<div v-show="!navSection.items">
 							<a class="DocLink link noitems" v-bind:href="navSection.link" v-bind:target="navSection.target || ''" style="padding-left: 0px;">

package/ui/js/doc.hornbill.js

@@ -319,7 +319,37 @@ function loadContentUrl(linkRef,fromPageRefresh,fromPopState)
 
 function loadBookDefaultLink()
 {
-    $(".DocLink").first().click();
+    $(".DocLink.link").first().click();
+}
+
+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)
+            {
+                return clickableItem;
+            }
+        }
+        else if(currentNavSection[x].link)
+        {
+            if(findByLinkRef)
+            {               
+                if(removeStartingSlash(removeTrailingSlash(currentNavSection[x].link)) == findByLinkRef)  return currentNavSection[x].link;
+            }
+            else 
+            {
+                return currentNavSection[x].link;
+            }
+        }
+    }    
 }
 
 function expandNavParentSectionBySelectedLinkHref(findByLinkRef, currentNavSection)
@@ -469,6 +499,7 @@ async function intialiseApp() {
     
                 //-- 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+"/","");
+                initialLoadContentHref = findFirstClickableBookLink(initialLoadContentHref);
                 if(initialLoadContentHref)
                 {
                     //-- find the link we are going to show and make sure parent/s are set to .expand=true
@@ -476,8 +507,7 @@ async function intialiseApp() {
                 }
                 else
                 {
-                    //-- we are loading root so select for link
-                    loadBookDefaultLink();   
+                    console.log("initial first view link to laod is not present");
                 }
             },200);
         });