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

support twitter hashbangs in urls for url parsing [ci skip]

Browse source
This commit is contained in:
danielgrippi 2012-01-08 17:35:29 -08:00
parent 5a9b17567c
commit a1cf279226
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,8 +42,8 @@ app.views.Content = app.views.StreamObject.extend({
} }
function urlify(text) { function urlify(text) {
var urlRegex = /(=\s?'|=\s?")?[-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, preceeder) { return text.replace(urlRegex, function(url, preceeder, bang) {
if(preceeder) return url 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

@ -142,6 +142,14 @@ describe("app.views.Post", function(){
}) })
}) })
it("works with urls that use #! syntax (i'm looking at you, twitter)')", function(){
link = "http://twitter.com/#!/hashbangs?gross=true"
this.statusMessage.set({text : link})
var view = new app.views.Post({model : this.statusMessage}).render();
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(){ it("doesn't create link tags for links that are already in <a/> or <img/> tags", function(){
link = "http://google.com" link = "http://google.com"