Merge pull request #7 from bit-docs/remove-link-escaping

garrettreed · web-flow · commit ec4d58035026 · 2016-10-31T14:38:15.000-04:00
Remove escape-html from makeLinks helper
diff --git a/build/build_test.js b/build/build_test.js
@@ -122,7 +122,7 @@ describe("documentjs/lib/generators/html/build",function(){
 		}, done);
 	});
 
-	it.only("escapes linked content (#5)",function(done){
+	it.only("makes linked content",function(done){
 		var options = {
 			html: { templates: path.join(__dirname,"test","escaped") },
 			dest: "XXXXYYYZZZ",
@@ -158,7 +158,7 @@ describe("documentjs/lib/generators/html/build",function(){
 			var renderer = results[0];
 
 			var result = renderer(docObject);
-			assert.equal(result, "<html><p>This is <a href=\"something.html\" title=\"something\">&lt;something/&gt;</a></p>\n\n</html>");
+			assert.equal(result, "<html><p>This is <a href=\"something.html\" title=\"something\"><something/></a></p>\n\n</html>");
 			done();
 		},done).catch(done);
 	});
diff --git a/build/make_default_helpers.js b/build/make_default_helpers.js
@@ -204,12 +204,12 @@ module.exports = function(docMap, config, getCurrent, Handlebars){
 					linkText = parts && parts[2] ? parts[2] : docObject.title || name;
 					description = docObject.description || name;
 
-					return '<a href="' + urlTo(name) + '" title="' + stripMarkdown(description) + '">' + escape(linkText) + '</a>';
+					return '<a href="' + urlTo(name) + '" title="' + stripMarkdown(description) + '">' + linkText + '</a>';
 				}
 
 				if (httpRegExp.test(name)) {
 					linkText = parts && parts[2] ? parts[2] : name;
-					return '<a href="' + name + '" title="' + escape(linkText) + '">' + escape(linkText) + '</a>';
+					return '<a href="' + name + '" title="' + escape(linkText) + '">' + linkText + '</a>';
 				}
 
 				return match;

Original file line number	Diff line number	Diff line change
`@@ -204,12 +204,12 @@ module.exports = function(docMap, config, getCurrent, Handlebars){`
`204`	`204`	`linkText = parts && parts[2] ? parts[2] : docObject.title \|\| name;`
`205`	`205`	`description = docObject.description \|\| name;`
`206`	`206`
`207`		`- return '<a href="' + urlTo(name) + '" title="' + stripMarkdown(description) + '">' + escape(linkText) + '</a>';`
	`207`	`+ return '<a href="' + urlTo(name) + '" title="' + stripMarkdown(description) + '">' + linkText + '</a>';`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`if (httpRegExp.test(name)) {`
`211`	`211`	`linkText = parts && parts[2] ? parts[2] : name;`
`212`		`- return '<a href="' + name + '" title="' + escape(linkText) + '">' + escape(linkText) + '</a>';`
	`212`	`+ return '<a href="' + name + '" title="' + escape(linkText) + '">' + linkText + '</a>';`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`return match;`