Avoid forward slashes to be encoded

buunguyen · buunguyen · commit f2713b4671f4 · 2016-05-17T16:57:00.000-07:00
diff --git a/src/adapters/adapter.js b/src/adapters/adapter.js
@@ -58,7 +58,7 @@ class Adapter {
 
             item.id = NODE_PREFIX + path
             item.text = name
-            item.icon = type // use `type` as class name for tree node
+            item.icon = type // uses `type` as class name for tree node
 
             if (node) {
               folders[''].push(item)
@@ -67,16 +67,16 @@ class Adapter {
               folders[path.substring(0, index)].push(item)
             }
 
-            if (type === 'tree') {
-              if (node) item.children = true
-              else folders[item.path] = item.children = []
-              item.a_attr = {
-                href: `/${repo.username}/${repo.reponame}/${type}/${repo.branch}/${encodeURIComponent(path)}`
+            if (type === 'tree' || type === 'blob') {
+              if (type === 'tree') {
+                if (node) item.children = true
+                else folders[item.path] = item.children = []
               }
-            }
-            else if (type === 'blob') {
+
+              // encodes but retains the slashes, see #274
+              const encodedPath = path.split('/').map(encodeURIComponent).join('/')
               item.a_attr = {
-                href: `/${repo.username}/${repo.reponame}/${type}/${repo.branch}/${encodeURIComponent(path)}`
+                href: `/${repo.username}/${repo.reponame}/${type}/${repo.branch}/${encodedPath}`
               }
             }
             else if (type === 'commit') {
diff --git a/src/view.tree.js b/src/view.tree.js
@@ -101,6 +101,9 @@ class TreeView {
     let $target = $(event.target)
     let download = false
 
+    // handle middle click
+    if (event.which === 2) return
+
     // handle icon click, fix #122
     if ($target.is('i.jstree-icon')) {
       $target = $target.parent()
@@ -109,9 +112,6 @@ class TreeView {
 
     if (!$target.is('a.jstree-anchor')) return
 
-    // handle middle click
-    if (event.which === 2) return
-
     // refocus after complete so that keyboard navigation works, fix #158
     const refocusAfterCompletion = () => {
       $(document).one('pjax:success page:load', () => {
