fix naviTarget in Chinese

vnotex · Sep 23, 2019 · 4659308 · 4659308
1 parent 1886890
commit 4659308
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 57 deletions.
diff --git a/dist/js/viki.js b/dist/js/viki.js
diff --git a/js/contentworker.js b/js/contentworker.js
@@ -35,7 +35,8 @@ class ContentWorker extends Worker {
                 fuzzySearch: this.viki.config.fuzzySearch
             });
 
-            if (info.naviIndex && info.naviFile === info.target) {
+            if (info.naviIndex &&
+                info.naviFile === decodeURIComponent(info.target)) {
                 navier.render(info.hostPath, info.naviFile, info.naviIndex, true);
             } else {
                 // Otherwise, no need to let navier load target.

diff --git a/js/navigationrenderer.js b/js/navigationrenderer.js
@@ -266,6 +266,7 @@ class NavigationRenderer {
         let utils  = new Utils();
         let basePath = utils.cleanPath(this.naviBase);
         let path = utils.cleanPath(p_path);
+        path = decodeURIComponent(path);
         if (!path.startsWith(basePath)) {
             return;
         }
@@ -275,7 +276,6 @@ class NavigationRenderer {
             return;
         }
 
-        path = decodeURIComponent(path);
         let pathNodes = path.split('/');
         this.expandToNode(tree.get_node('#'), pathNodes, 0);
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "viki",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A simple Wiki page in Markdown from notebook of VNote.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"