Better API for parsing out blocks in the parser.

2013-08-29 11:38:51 -04:00
parent bbd79aafd1
commit 3cec95a2c3
6 changed files with 107 additions and 181 deletions
@@ -5,77 +5,12 @@
  @event register
  @namespace Discourse.Dialect
 **/
-Discourse.Dialect.on("register", function(event) {
-  var dialect = event.dialect,
-      MD = event.MD;
-
-  /**
-    Support for github style code blocks
-
-    @method githubCode
-    @param {Markdown.Block} block the block to examine
-    @param {Array} next the next blocks in the sequence
-    @return {Array} the JsonML containing the markup or undefined if nothing changed.
-    @namespace Discourse.Dialect
-  **/
-  dialect.block.github_code = function githubCode(block, next) {
-
-    var m = /^`{3}([^\n]+)?\n?([\s\S]*)?/gm.exec(block);
-
-    if (m) {
-      var startPos = block.indexOf(m[0]),
-          leading,
-          codeContents = [],
-          result = [],
-          lineNumber = block.lineNumber;
-
-      if (startPos > 0) {
-        leading = block.slice(0, startPos);
-        lineNumber += (leading.split("\n").length - 1);
-
-        var para = ['p'];
-        this.processInline(leading).forEach(function (l) {
-          para.push(l);
-        });
-
-        result.push(para);
-      }
-
-      if (m[2]) { next.unshift(MD.mk_block(m[2], null, lineNumber + 1)); }
-
-      lineNumber++;
-      while (next.length > 0) {
-        var b = next.shift(),
-            blockLine = b.lineNumber,
-            diff = ((typeof blockLine === "undefined") ? lineNumber : blockLine) - lineNumber;
-
-        var endFound = b.indexOf('```'),
-            leadingCode = b.slice(0, endFound),
-            trailingCode = b.slice(endFound+3);
-
-        for (var i=1; i<diff; i++) {
-          codeContents.push("");
-        }
-        lineNumber = blockLine + b.split("\n").length - 1;
-
-        if (endFound !== -1) {
-          if (trailingCode) {
-            next.unshift(MD.mk_block(trailingCode));
-          }
-
-          codeContents.push(leadingCode.replace(/\s+$/, ""));
-          break;
-        } else {
-          codeContents.push(b);
-        }
-      }
-
-
-      result.push(['p', ['pre', ['code', {'class': m[1] || 'lang-auto'}, codeContents.join("\n") ]]]);
-      return result;
-    }
-  };
-
+Discourse.Dialect.replaceBlock({
+  start: /^`{3}([^\n]+)?\n?([\s\S]*)?/gm,
+  stop: '```',
+  emitter: function(blockContents, matches) {
+    return ['p', ['pre', ['code', {'class': matches[1] || 'lang-auto'}, blockContents.join("\n") ]]];
+  }
 });

 // Ensure that content in a code block is fully escaped. This way it's not white listed