From a899e71ce546afc87f23cfc32449ed8866f0cea7 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Sat, 7 Jan 2012 21:19:13 -0800
Subject: [PATCH] switch order of auto-linking

---
 public/javascripts/app/views/content_view.js | 6 +++---
 spec/javascripts/app/views/post_view_spec.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/javascripts/app/views/content_view.js b/public/javascripts/app/views/content_view.js
index c616392b2..000cfbb09 100644
--- a/public/javascripts/app/views/content_view.js
+++ b/public/javascripts/app/views/content_view.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)
           )
         )
diff --git a/spec/javascripts/app/views/post_view_spec.js b/spec/javascripts/app/views/post_view_spec.js
index f4fc85d44..26893d0d0 100644
--- a/spec/javascripts/app/views/post_view_spec.js
+++ b/spec/javascripts/app/views/post_view_spec.js
@@ -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();