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

switch order of auto-linking

Browse source
This commit is contained in:
danielgrippi 2012-01-07 21:19:13 -08:00
parent 07d81e0a85
commit a899e71ce5
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,9 +8,9 @@ app.views.Content = app.views.StreamObject.extend({
function metafyText(text) { function metafyText(text) {
//we want it to return at least a <p> from markdown //we want it to return at least a <p> from markdown
text = text || "" text = text || ""
return mentionify( return urlify(
hashtagify( mentionify(
urlify( hashtagify(
markdownify(text) markdownify(text)
) )
) )

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

@ -131,8 +131,8 @@ describe("app.views.Post", function(){
links = ["http://google.com", links = ["http://google.com",
"https://joindiaspora.com", "https://joindiaspora.com",
"http://www.yahooligans.com", "http://www.yahooligans.com",
"obama.com", "http://obama.com",
"japan.co.jp"] "http://japan.co.jp"]
this.statusMessage.set({text : links.join(" ")}) this.statusMessage.set({text : links.join(" ")})
var view = new app.views.Post({model : this.statusMessage}).render(); var view = new app.views.Post({model : this.statusMessage}).render();