Merge pull request #769 from hmhealey/plt334

PLT-334 Restricted markdown output to only appear on one line when in singleline mode

web/react/utils/markdown.jsx

@@ -15,6 +15,14 @@ export class MattermostMarkdownRenderer extends marked.Renderer {
         this.formattingOptions = formattingOptions;
     }
 
+    br() {
+        if (this.formattingOptions.singleline) {
+            return ' ';
+        }
+
+        return super.br();
+    }
+
     heading(text, level, raw) {
         const id = `${this.options.headerPrefix}${raw.toLowerCase().replace(/[^\w]+/g, '-')}`;
         return `<h${level} id="${id}" class="markdown__heading">${text}</h${level}>`;
@@ -36,6 +44,14 @@ export class MattermostMarkdownRenderer extends marked.Renderer {
         return output;
     }
 
+    paragraph(text) {
+        if (this.formattingOptions.singleline) {
+            return `<p class="markdown__paragraph-inline">${text}</p>`;
+        }
+
+        return super.paragraph(text);
+    }
+
     table(header, body) {
         return `<table class="markdown__table"><thead>${header}</thead><tbody>${body}</tbody></table>`;
     }

web/sass-files/sass/partials/_markdown.scss

@@ -1,6 +1,12 @@
 .markdown__heading {
 	font-weight: bold;
 }
+.markdown__paragraph-inline {
+    display: inline;
+    + .markdown__paragraph-inline {
+        margin-left: 4px;
+    }
+}
 .markdown__table {
 	background: #fff;
 	margin: 5px 0 10px;
@@ -25,4 +31,4 @@ pre {
 	code {
 		color: #c7254e;
 	}
-}
+}