nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2881 from beardedninja/master

Browse source 
Added a post conversion hook to PageDown + amended test for autolinking, fixes #2792
This commit is contained in:
Maxwell Salzberg 2012-02-18 16:12:39 -08:00
commit 4f2783487d
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
public/javascripts/app/helpers/text_formatter.js
View file

@ -12,6 +12,11 @@
textFormatter.markdownify = function markdownify(text){ textFormatter.markdownify = function markdownify(text){
var converter = Markdown.getSanitizingConverter(); var converter = Markdown.getSanitizingConverter();
converter.hooks.chain("postConversion", function (text) {
return text.replace(/(\"(?:(?:http|https):\/\/)?[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(?:\/\S*)?\")(\>)/g, '$1 target="_blank">')
});
return converter.makeHtml(text) return converter.makeHtml(text)
}; };

4
spec/javascripts/app/helpers/text_formatter_spec.js
View file

@ -40,7 +40,9 @@ describe("app.helpers.textFormatter", function(){
var wrapper = $("<div>").html(formattedText); var wrapper = $("<div>").html(formattedText);
_.each(links, function(link) { _.each(links, function(link) {
expect(wrapper.find("a[href='" + link + "']").text()).toContain(link) var linkElement = wrapper.find("a[href='" + link + "']");
expect(linkElement.text()).toContain(link);
expect(linkElement.attr("target")).toContain("_blank");
}) })
}) })
}) })