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

fix http urls with 3 slashes

Browse source
This commit is contained in:
Maxwell Salzberg 2012-04-04 19:07:08 -07:00
parent 39d688044d
commit 9c9562d0fd
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/helpers/text_formatter.js
View file

@ -25,7 +25,7 @@
// process links // process links
// regex copied from: https://code.google.com/p/pagedown/source/browse/Markdown.Converter.js#1198 (and slightly expanded) // regex copied from: https://code.google.com/p/pagedown/source/browse/Markdown.Converter.js#1198 (and slightly expanded)
var linkRegex = /(\[.*\]:\s)?(<|\()((https?|ftp):[^'">\s]+)(>|\))/gi; var linkRegex = /(\[.*\]:\s)?(<|\()((https?|ftp):\/\/[^\/'">\s][^'">\s]+)(>|\))/gi;
text = text.replace(linkRegex, function() { text = text.replace(linkRegex, function() {
var unicodeUrl = arguments[3]; var unicodeUrl = arguments[3];
var addr = parse_url(unicodeUrl); var addr = parse_url(unicodeUrl);
@ -34,7 +34,7 @@
( (addr.scheme.toLowerCase()=="mailto") ? ':' : '://')) + ( (addr.scheme.toLowerCase()=="mailto") ? ':' : '://')) +
(!addr.user ? '' : addr.user + (!addr.user ? '' : addr.user +
(!addr.pass ? '' : ':'+addr.pass) + '@') + (!addr.pass ? '' : ':'+addr.pass) + '@') +
punycode.toASCII(addr.host) + punycode.toASCII(addr.host) +
(!addr.port ? '' : ':' + addr.port) + (!addr.port ? '' : ':' + addr.port) +
(!addr.path ? '' : addr.path) + (!addr.path ? '' : addr.path) +
(!addr.query ? '' : '?' + addr.query) + (!addr.query ? '' : '?' + addr.query) +

7
spec/javascripts/app/views/post_view_spec.js
View file

@ -69,5 +69,12 @@ describe("app.views.Post", function(){
expect($(view.el).html()).toContain(specialLink); expect($(view.el).html()).toContain(specialLink);
expect($(view.el).html()).toContain(normalLink); expect($(view.el).html()).toContain(normalLink);
}); });
it("works when three slashes are present in the url", function(){
var badURL = "http:///scholar.google.com/citations?view_op=top_venues"
this.statusMessage.set({text : badURL});
var view = new app.views.StreamPost({model: this.statusMessage}).render();
})
}); });
}); });