Replace Markdown Linebreak Regexp with node parser.

2013-08-26 15:21:23 -04:00
parent 7c07079ed9
commit 2d45c56ba5
8 changed files with 111 additions and 32 deletions
@@ -84,10 +84,48 @@ Discourse.Dialect.on("register", function(event) {
  @namespace Discourse.Dialect
 **/
 Discourse.Dialect.on("parseNode", function(event) {
-  var node = event.node,
-      path = event.path;
+  var node = event.node;

  if (node[0] === 'code') {
    node[node.length-1] = Handlebars.Utils.escapeExpression(node[node.length-1]);
  }
 });
+
+
+Discourse.Dialect.on("parseNode", function(event) {
+
+  var node = event.node,
+      opts = event.dialect.options,
+      insideCounts = event.insideCounts,
+      linebreaks = opts.traditional_markdown_linebreaks || Discourse.SiteSettings.traditional_markdown_linebreaks;
+
+  if (!linebreaks) {
+    // We don't add line breaks inside a pre
+    if (insideCounts.pre > 0) { return; }
+
+    if (node.length > 1) {
+      for (var j=1; j<node.length; j++) {
+        var textContent = node[j];
+
+        if (typeof textContent === "string") {
+
+          if (textContent === "\n") {
+            node[j] = ['br'];
+          } else {
+            var split = textContent.split(/\n+/);
+            if (split.length) {
+              var spliceInstructions = [j, 1];
+              for (var i=0; i<split.length; i++) {
+                if (split[i].length > 0) {
+                  spliceInstructions.push(split[i]);
+                  if (i !== split.length-1) { spliceInstructions.push(['br']); }
+                }
+              }
+              node.splice.apply(node, spliceInstructions);
+            }
+          }
+        }
+      }
+    }
+  }
+});