hdoc-tools 0.9.45 → 0.9.46

package/package.json

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

package/ui/js/doc.hornbill.js

@@ -133,6 +133,7 @@ function listenForHrefClicks()
 
 }
 
+//-- based on content url highlight match navigation menu item
 //-- based on content url highlight match navigation menu item
 function highlightNavigationLinkFromUrl(matchLinkHref)
 {
@@ -140,32 +141,45 @@ function highlightNavigationLinkFromUrl(matchLinkHref)
     matchLinkHref = removeStartingSlash(matchLinkHref).split("#")[0]; //-- remvoe # link
     $('a.DocLink').removeClass("active");
     
-    document.querySelectorAll('a.DocLink').forEach((el) => {
-        
+    let arrItems = document.querySelectorAll('a.DocLink');
+    
+    for(let x=0;x<arrItems.length;x++)
+    {       
         let checkUrl = null;
         try{
             checkUrl = new URL(el.href);
         }
         catch(e)
         {
-            console.log("BAD navigation menu item found",el.href);
+            //console.log("BAD navigation menu item found",el);
         }
 
         if(checkUrl)
         {
             //console.log(checkUrl.pathname,matchLinkHref)
-            if(removeStartingSlash(checkUrl.pathname).indexOf(matchLinkHref)===0)
+            let testCurrPath = removeStartingSlash(checkUrl.pathname);
+            if(testCurrPath===matchLinkHref)
             {
-                $(el).addClass("active");
+                //-- exact match
+                $(el).addClass("active")
+                el.scrollIntoView();
+                return false;//break out
+            }
+            else if(testCurrPath.indexOf(matchLinkHref)===0)
+            {
+                //-- 
+                $(el).addClass("active")
+                el.scrollIntoView();
                 return false;//break out
             }
             else if(matchLinkHref.indexOf(removeStartingSlash(checkUrl.pathname) + "/")===0)
             {
                 $(el).addClass("active");
+                el.scrollIntoView();
                 return false;//break out
             }
         }
-    });
+    }
 }
 
 function getAnchorFromHash(strHash,strHasClass)

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Hornbill Docs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.