fix path handling

binder-project · Aug 24, 2016 · aace51d · aace51d
1 parent a67b316
commit aace51d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/server/index.js b/server/index.js
@@ -49,11 +49,11 @@ app.get('/repo/:org/:repo/status', function (req, res) {
   return res.sendFile(path.join(staticPath, 'index.html'))
 })
 
-app.get('/repo/:org/:repo', function (req, res) {
+app.get('/repo/:org/:repo/tree/:branch', function (req, res) {
   return res.sendFile(path.join(staticPath, 'loading.html'))
 })
 
-app.get('/repo/:org/:repo/tree/:branch', function (req, res) {
+app.get('/repo/:org/:repo*', function (req, res) {
   return res.sendFile(path.join(staticPath, 'loading.html'))
 })
 

diff --git a/site/loading.js b/site/loading.js
@@ -78,10 +78,8 @@ var apiServer = getOrigin()
 
 var path = window.location.pathname.slice(6)
 var split = path.split('/')
-console.log('split', split)
-
-var displayName = path
-var deepLink = ''
+var deepLink = (split.length > 2) ? '/' + split.slice(2).join('/') : ''
+var displayName = path.indexOf('/tree') > -1 ? path : split.slice(0, 2).join('/')
 
 // add logo
 var header = document.createElement('div')
@@ -147,6 +145,7 @@ var makeSuccess = function () {
 }
 
 var templateName = displayName.replace('/tree', '').replace(/\//g, '-').toLowerCase()
+
 async.waterfall([
   function (next) {
     request({