gsadmin/gitbook
1
0
Fork 0
mirror of https://github.com/GitbookIO/gitbook.git synced 2026-09-23 11:03:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1328: fix crash when anchor links

Browse Source
This commit is contained in:
Samy Pesse
2016-05-25 21:49:58 +02:00
parent 7e8f1a9632
commit 089815a8fd
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/output/modifiers/__tests__/resolveLinks.js
+12 -2
View File
@@ -40,9 +40,8 @@ describe('resolveLinks', function() {
});
describe('Anchor', function() {
var TEST = '<p>This is a <a href="test/cool.md#an-anchor"></a></p>';
it('should prevent anchors in resolution', function() {
var TEST = '<p>This is a <a href="test/cool.md#an-anchor"></a></p>';
var $ = cheerio.load(TEST);
return resolveLinks('hello.md', resolveFileCustom, $)
@@ -51,6 +50,17 @@ describe('resolveLinks', function() {
expect(link.attr('href')).toBe('test/cool.html#an-anchor');
});
});
it('should ignore pure anchor links', function() {
var TEST = '<p>This is a <a href="#an-anchor"></a></p>';
var $ = cheerio.load(TEST);
return resolveLinks('hello.md', resolveFileCustom, $)
.then(function() {
var link = $('a');
expect(link.attr('href')).toBe('#an-anchor');
});
});
});
describe('Custom Resolver', function() {
lib/output/modifiers/resolveLinks.js
+9 -7
View File
@@ -30,16 +30,18 @@ function resolveLinks(currentFile, resolveFile, $) {
// Split anchor
var parsed = url.parse(href);
href = parsed.pathname;
href = parsed.pathname || '';
// Calcul absolute path for this
href = LocationUtils.toAbsolute(href, currentDirectory, '.');
if (href) {
// Calcul absolute path for this
href = LocationUtils.toAbsolute(href, currentDirectory, '.');
// Resolve file
href = resolveFile(href);
// Resolve file
href = resolveFile(href);
// Convert back to relative
href = LocationUtils.relative(currentDirectory, href);
// Convert back to relative
href = LocationUtils.relative(currentDirectory, href);
}
// Add back anchor
href = href + (parsed.hash || '');