Merge pull request #7072 from jm-factorin/markdown-carriage-return

[FIX] Add support for carriage return in markdown code blocks
RocketChat · May 31, 2017 · d695d10 · d695d10
2 parents 90ef85f + ef67267
commit d695d10
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/rocketchat-markdown/markdowncode.js b/packages/rocketchat-markdown/markdowncode.js
@@ -51,12 +51,12 @@ class MarkdownCode {
 			}
 
 			// Separate text in code blocks and non code blocks
-			const msgParts = message.html.split(/(^.*)(```(?:[a-zA-Z]+)?(?:(?:.|\n)*?)```)(.*\n?)$/gm);
+			const msgParts = message.html.split(/(^.*)(```(?:[a-zA-Z]+)?(?:(?:.|\r|\n)*?)```)(.*\n?)$/gm);
 
 			for (let index = 0; index < msgParts.length; index++) {
 				// Verify if this part is code
 				const part = msgParts[index];
-				const codeMatch = part.match(/^```(.*[\n\ ]?)([\s\S]*?)```+?$/);
+				const codeMatch = part.match(/^```(.*[\r\n\ ]?)([\s\S]*?)```+?$/);
 
 				if (codeMatch != null) {
 					// Process highlight if this part is code