From 2eb320f48a66b42832b758e5fc6700358aef34ed Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Sat, 19 Sep 2015 10:33:13 -0400
Subject: Changed markdown link parsing to automatically add an explicit
 protocol to urls

---
 web/react/utils/markdown.jsx        | 14 ++++++++++++++
 web/react/utils/text_formatting.jsx |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 web/react/utils/markdown.jsx

(limited to 'web/react/utils')

diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx
new file mode 100644
index 000000000..880e41a18
--- /dev/null
+++ b/web/react/utils/markdown.jsx
@@ -0,0 +1,14 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+const marked = require('marked');
+
+export class MattermostMarkdownRenderer extends marked.Renderer {
+    link(href, title, text) {
+        if (href.lastIndexOf('http', 0) !== 0) {
+            href = `http://${href}`;
+        }
+
+        return super.link(href, title, text);
+    }
+}
diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx
index da0595326..537ddb394 100644
--- a/web/react/utils/text_formatting.jsx
+++ b/web/react/utils/text_formatting.jsx
@@ -3,12 +3,13 @@
 
 const Autolinker = require('autolinker');
 const Constants = require('./constants.jsx');
+const Markdown = require('./markdown.jsx');
 const UserStore = require('../stores/user_store.jsx');
 const Utils = require('./utils.jsx');
 
 const marked = require('marked');
 
-const markdownRenderer = new marked.Renderer();
+const markdownRenderer = new Markdown.MattermostMarkdownRenderer();
 
 // Performs formatting of user posts including highlighting mentions and search terms and converting urls, hashtags, and
 // @mentions to links by taking a user's message and returning a string of formatted html. Also takes a number of options
-- 
cgit v1.2.3-1-g7c22