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

better regex for capturing urls (sensitive to urls in tags) [ci skip]

Browse source
This commit is contained in:
danielgrippi 2012-01-08 17:06:17 -08:00
parent 665517abfc
commit 5e65c88bd8
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
public/javascripts/app/views/content_view.js
View file

@ -42,8 +42,9 @@ app.views.Content = app.views.StreamObject.extend({
} }
function urlify(text) { function urlify(text) {
var urlRegex = /[-a-zA-Z0-9@:%_\+.~#?&//=]{2,256}\.[a-z]{2,4}\b(\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?/gi var urlRegex = /(=\s?'|=\s?")?[-a-zA-Z0-9@:%_\+.~#?&//=]{2,256}\.[a-z]{2,4}\b(\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?/gi
return text.replace(urlRegex, function(url) { return text.replace(urlRegex, function(url, preceeder) {
if(preceeder) return url
var protocol = (url.search(/:\/\//) == -1 ? "http://" : "") var protocol = (url.search(/:\/\//) == -1 ? "http://" : "")
return "<a href='" + protocol + url + "' target=_blank>" + url + "</a>" return "<a href='" + protocol + url + "' target=_blank>" + url + "</a>"
}) })

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

@ -141,6 +141,14 @@ describe("app.views.Post", function(){
expect(view.$("a[href='" + link + "']").text()).toContain(link) expect(view.$("a[href='" + link + "']").text()).toContain(link)
}) })
}) })
it("doesn't create link tags for links that are already in <a/> or <img/> tags", function(){
link = "http://google.com"
this.statusMessage.set({text : "![cats](http://google.com/cats)"})
var view = new app.views.Content({model : this.statusMessage})
expect(view.presenter().text).toNotContain('</a>')
})
}) })
context("user not signed in", function(){ context("user not signed in", function(){