From 379a9a89ed91dd8a190901c1d564228668416c0c Mon Sep 17 00:00:00 2001
From: Florian Orben <florian.orben@gmail.com>
Date: Mon, 30 Nov 2015 03:17:19 +0100
Subject: support gfm tasklists

---
 web/react/utils/markdown.jsx | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'web/react')

diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx
index 9d9bdfb7a..609e93e1d 100644
--- a/web/react/utils/markdown.jsx
+++ b/web/react/utils/markdown.jsx
@@ -223,6 +223,14 @@ class MattermostMarkdownRenderer extends marked.Renderer {
         return `<table class="markdown__table"><thead>${header}</thead><tbody>${body}</tbody></table>`;
     }
 
+    listitem(text) {
+        const taskListReg = /^\[([ |xX])\] /;
+        const isTaskList = taskListReg.exec(text);
+        return isTaskList ?
+            `<li>${'<input type="checkbox" disabled="disabled" ' + (isTaskList[1] === ' ' ? '' : 'checked="checked" ') + '/> '}${text.replace(taskListReg, '')}</li>` :
+            `<li>${text}</li>`;
+    }
+
     text(txt) {
         return TextFormatting.doFormatText(txt, this.formattingOptions);
     }
-- 
cgit v1.2.3-1-g7c22


From 6cd283e7f6c6e0d3878df54ba957e513b5190081 Mon Sep 17 00:00:00 2001
From: Florian Orben <florian.orben@gmail.com>
Date: Mon, 30 Nov 2015 18:21:02 +0100
Subject: refactor not to use nested ternary statements

---
 web/react/utils/markdown.jsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'web/react')

diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx
index 609e93e1d..f2721c81d 100644
--- a/web/react/utils/markdown.jsx
+++ b/web/react/utils/markdown.jsx
@@ -226,9 +226,11 @@ class MattermostMarkdownRenderer extends marked.Renderer {
     listitem(text) {
         const taskListReg = /^\[([ |xX])\] /;
         const isTaskList = taskListReg.exec(text);
-        return isTaskList ?
-            `<li>${'<input type="checkbox" disabled="disabled" ' + (isTaskList[1] === ' ' ? '' : 'checked="checked" ') + '/> '}${text.replace(taskListReg, '')}</li>` :
-            `<li>${text}</li>`;
+
+        if (isTaskList) {
+            return `<li>${'<input type="checkbox" disabled="disabled" ' + (isTaskList[1] === ' ' ? '' : 'checked="checked" ') + '/> '}${text.replace(taskListReg, '')}</li>`;
+        }
+        return `<li>${text}</li>`;
     }
 
     text(txt) {
-- 
cgit v1.2.3-1-g7c22