relative_url helper: replace trailing slash with index.html.

hexojs · May 18, 2015 · 03077e7 · 03077e7
1 parent 021456c
commit 03077e7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/lib/plugins/helper/relative_url.js b/lib/plugins/helper/relative_url.js
@@ -17,6 +17,13 @@ function relativeUrlHelper(from, to){
  out.unshift('..');
  }
 
+ var outLength = out.length;
+
+ // If the last 2 elements of `out` is empty strings, replace them with `index.html`.
+ if (outLength > 1 && !out[outLength - 1] && !out[outLength] - 2){
+ out = out.slice(0, outLength - 2).concat('index.html');
+ }
+
  return out.join('/').replace(/\/{2,}/g, '/');
 }
 

diff --git a/test/scripts/helpers/relative_url.js b/test/scripts/helpers/relative_url.js
@@ -25,8 +25,8 @@ describe('relative_url', function(){
  });
 
  it('to root', function(){
- relativeURL('index.html', '/').should.eql('/');
- relativeURL('foo/', '/').should.eql('../');
- relativeURL('foo/index.html', '/').should.eql('../');
+ relativeURL('index.html', '/').should.eql('index.html');
+ relativeURL('foo/', '/').should.eql('../index.html');
+ relativeURL('foo/index.html', '/').should.eql('../index.html');
  });
-});
+});