fix # in file name

vnotex · Feb 13, 2019 · 239d3e2 · 239d3e2
1 parent 0e8cde6
commit 239d3e2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/js/navigationrenderer.js b/js/navigationrenderer.js
@@ -124,7 +124,7 @@ class NavigationRenderer {
                                     v_type: 'folder',
                                     v_name: folder.name,
                                     // Path of this item without ending /.
-                                    v_path: basePath + folder.name
+                                    v_path: basePath + encodeURIComponent(folder.name)
                                 };
 
                                 children.push(folderItem);
@@ -146,7 +146,7 @@ class NavigationRenderer {
                                     // Viki specific attrs.
                                     v_type: 'file',
                                     v_name: file.name,
-                                    v_path: basePath + file.name
+                                    v_path: basePath + encodeURIComponent(file.name)
                                 };
 
                                 children.push(fileItem);

diff --git a/js/naviworker.js b/js/naviworker.js
@@ -237,7 +237,7 @@ class NaviWorker extends Worker {
     // Route current access target through navigation items.
     routeTarget() {
         let items = this.viki.naviItems;
-        let target = this.viki.info.target.toLowerCase();
+        let target = decodeURIComponent(this.viki.info.target).toLowerCase();
 
         let utils = new Utils();
 

diff --git a/js/viki.js b/js/viki.js
@@ -119,8 +119,7 @@ class Viki {
             target = "index.md";
         }
 
-        target = decodeURIComponent(target);
-
+        // Do not decode URI here.
         // Anchor.
         let idx = target.indexOf('#');
         if (idx != -1) {

diff --git a/js/vikiinfo.js b/js/vikiinfo.js
@@ -2,10 +2,10 @@ import Utils from "./utils.js";
 
 class VikiInfo {
     constructor() {
-        // Target page specified by user.
+        // Target page specified by user (encoded).
         this.target = '';
 
-        // Anchor within target page.
+        // Anchor within target page (encoded).
         this.anchor = '';
 
         // Base url.