From d6925c26c20f40f7178330279453bb3b6d2e0b65 Mon Sep 17 00:00:00 2001
From: edisonxiang <xiang.edison@gmail.com>
Date: Thu, 12 Sep 2019 03:51:16 +0800
Subject: [PATCH] docs navigate correctly

---
 .../project/layouts/partials/docs/menu.html   |  2 +-
 .../project/layouts/partials/docs/search.html |  2 +-
 themes/project/layouts/partials/scripts.html  | 63 ++++++++++++++++++-
 themes/project/static/css/custom.css          | 28 +++++++--
 4 files changed, 87 insertions(+), 8 deletions(-)

diff --git a/themes/project/layouts/partials/docs/menu.html b/themes/project/layouts/partials/docs/menu.html
index 15b44d6..57ba1be 100644
--- a/themes/project/layouts/partials/docs/menu.html
+++ b/themes/project/layouts/partials/docs/menu.html
@@ -1,5 +1,5 @@
 <nav>
-<!-- {{ partial "docs/search" . }} -->
+{{ partial "docs/search" . }}
 {{ partial "docs/inject/menu-before" . }}
 
 {{ if .Site.Params.BookMenuBundle }}
diff --git a/themes/project/layouts/partials/docs/search.html b/themes/project/layouts/partials/docs/search.html
index b15ca6d..fc49109 100644
--- a/themes/project/layouts/partials/docs/search.html
+++ b/themes/project/layouts/partials/docs/search.html
@@ -1,5 +1,5 @@
 {{ if default true .Site.Params.BookSearch }}
-<div class="book-search">
+<div class="book-search" style="display: none;">
   <input type="text" placeholder="Search" id="book-search-input" maxlength="64" readonly />
   <div class="book-search-spinner spinner hidden"></div>
   <ul id="book-search-results"></ul>
diff --git a/themes/project/layouts/partials/scripts.html b/themes/project/layouts/partials/scripts.html
index b2e88b1..36a7f9e 100644
--- a/themes/project/layouts/partials/scripts.html
+++ b/themes/project/layouts/partials/scripts.html
@@ -22,12 +22,71 @@
 
 <script type="text/javascript">
     $(document).ready(function () {
+
+        function getRelativePath() {
+            var url = location.href;
+            var arrURL = url.split("//");
+            return arrURL[1].substring(arrURL[1].indexOf("/"));
+        }
+
+        function getCurrentID(wholeData, relativeURL) {
+            for (var j in wholeData) {
+                var href = wholeData[j].a_attr.href;
+                var text = wholeData[j].text;
+                //debugger;
+                if ((href == relativeURL) || (text.indexOf(relativeURL) >= 0)) {
+                    //console.log(wholeData[j].id);
+                    return wholeData[j].id;
+                } else {
+                    if (wholeData[j].children.length > 0) {
+                        var v = getCurrentID(wholeData[j].children, relativeURL);
+                        if (v != "") {
+                            return v;
+                        }
+                    }
+                }
+            }
+            return "";
+        }
+
         if ($('#docstreeview').length) {
             $('#docstreeview').jstree();
             $('#docstreeview').jstree().hide_dots();
             $('#docstreeview').jstree().hide_icons();
             $('#docstreeview').on("changed.jstree", function (e, data) {
-                location.href = data.node.a_attr.href;
+                if (data.node) {
+                    var link = data.node.a_attr.href;
+                    if (link == "" || link == "#") {
+                        var aElementID = "#" + data.node.id + "_anchor";
+                        var aElement = $(aElementID).find("a");
+                        if (aElement.length) {
+                            link = aElement.attr("href");
+                        }
+                    }
+                    console.log(link);
+                    var relativeURL = getRelativePath();
+                    console.log(relativeURL);
+                    if (link != relativeURL) {
+                        location.href = link;
+                    }
+                }
+            });
+
+            /* select the node by the relative url
+            var currentAElement = $('#docstreeview').find("a[href='" + getRelativePath() + "']");
+            if (currentAElement.length) {
+                console.log("click");
+                currentAElement.trigger("click");
+            }*/
+
+            $("#docstreeview").on("ready.jstree", function (e, data) {
+                $("#docstreeview").fadeIn("slow")
+                var relativeURL = getRelativePath();
+                var wholeData = $("#docstreeview").jstree().get_json();
+                var currentID = getCurrentID(wholeData, relativeURL);
+                console.log(currentID);
+                $("#docstreeview").jstree()._open_to(currentID);
+                $('#docstreeview').jstree().select_node(currentID);
             });
         }
         function showNav() {
@@ -41,7 +100,7 @@
             }).attr("onoff", "off");
         }
 
-        $("#slideNav").bind('click' ,function(){
+        $("#slideNav").bind('click', function () {
             if ($('#menu').attr("onoff") == "on") {
                 hideNav();
             } else {
diff --git a/themes/project/static/css/custom.css b/themes/project/static/css/custom.css
index d37e0a1..67b4108 100644
--- a/themes/project/static/css/custom.css
+++ b/themes/project/static/css/custom.css
@@ -449,8 +449,26 @@ footer .notice span {
   margin-bottom: 148px;
 }
 
-.jstree-default .jstree-anchor {
-  height: 35px !important;
+.book-menu .jstree-default .jstree-anchor {
+  height: 36px;
+  text-decoration: none;
+  color: inherit;
+  padding: 6px 0px;
+}
+
+.book-menu .jstree-default .jstree-anchor a {
+  text-decoration: none;
+  color: inherit;
+}
+
+.book-menu .jstree-default .jstree-anchor.jstree-hovered,
+.book-menu .jstree-default .jstree-anchor.jstree-clicked {
+  color: #ffffff;
+  background-color: #467fbf;
+}
+
+.book-menu .jstree-default .jstree-icon.jstree-ocl {
+  margin-top:6px;
 }
 
 .table-bordered.table-striped td {
@@ -469,8 +487,6 @@ footer .notice span {
   line-height: 25px;  
 }
 
-
-
 .divmail ul li a {
   margin-left: 10px;
 }
@@ -491,6 +507,10 @@ footer .notice span {
   text-decoration: none !important;
 }
 
+#docstreeview {
+  display: none;
+}
+
 /*html {
   min-width: 1280px;
   max-width: 1920px;
-- 
GitLab