From 975074b2ae2692f596edb263bb27727b43f33489 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Fri, 4 Dec 2015 12:28:46 -0500
Subject: Fix embeds and add default fixed height

---
 web/react/utils/utils.jsx | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'web/react/utils')

diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 0a52f5b37..f5e0cedf5 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -252,13 +252,6 @@ export function getTimestamp() {
 
 // extracts links not styled by Markdown
 export function extractLinks(text) {
-    const urlMatcher = new Autolinker.matchParser.MatchParser({
-        urls: true,
-        emails: false,
-        twitter: false,
-        phone: false,
-        hashtag: false
-    });
     const links = [];
     let replaceText = text;
 
@@ -271,7 +264,7 @@ export function extractLinks(text) {
         }
     }
 
-    function replaceFn(match) {
+    function replaceFn(autolinker, match) {
         let link = '';
         const matchText = match.getMatchedText();
         const tempText = replaceText;
@@ -304,7 +297,16 @@ export function extractLinks(text) {
 
         links.push(link);
     }
-    urlMatcher.replace(text, replaceFn, this);
+
+    Autolinker.link(text, {
+        replaceFn,
+        urls: true,
+        emails: false,
+        twitter: false,
+        phone: false,
+        hashtag: false
+    });
+
     return {links, text};
 }
 
-- 
cgit v1.2.3-1-g7c22