Permalink
Browse files

switch order of auto-linking

  • Loading branch information...
1 parent 07d81e0 commit a899e71ce546afc87f23cfc32449ed8866f0cea7 @danielgrippi danielgrippi committed Jan 8, 2012
Showing with 5 additions and 5 deletions.
  1. +3 −3 public/javascripts/app/views/content_view.js
  2. +2 −2 spec/javascripts/app/views/post_view_spec.js
@@ -8,9 +8,9 @@ app.views.Content = app.views.StreamObject.extend({
function metafyText(text) {
//we want it to return at least a <p> from markdown
text = text || ""
- return mentionify(
- hashtagify(
- urlify(
+ return urlify(
+ mentionify(
+ hashtagify(
markdownify(text)
)
)
@@ -131,8 +131,8 @@ describe("app.views.Post", function(){
links = ["http://google.com",
"https://joindiaspora.com",
"http://www.yahooligans.com",
- "obama.com",
- "japan.co.jp"]
+ "http://obama.com",
+ "http://japan.co.jp"]
this.statusMessage.set({text : links.join(" ")})
var view = new app.views.Post({model : this.statusMessage}).render();

0 comments on commit a899e71

Please sign in to comment.