From 7ab98bb0e7ccb8369940deb8802821496472225d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 4 Jul 2014 14:14:50 -0400
Subject: [PATCH] FIX: Missing formatting for oneboxes in preview

---
 .../javascripts/discourse/dialects/dialect.js | 21 ++++++++++++++-----
 test/javascripts/mdtest/mdtest.js.erb         |  2 +-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/dialects/dialect.js b/app/assets/javascripts/discourse/dialects/dialect.js
index 86e1adf8e0b..32c1fed30dd 100644
--- a/app/assets/javascripts/discourse/dialects/dialect.js
+++ b/app/assets/javascripts/discourse/dialects/dialect.js
@@ -1,3 +1,4 @@
+/*global md5:true */
 /**
 
   Discourse uses the Markdown.js as its main parser. `Discourse.Dialect` is the framework
@@ -9,7 +10,8 @@ var parser = window.BetterMarkdown,
     DialectHelpers = parser.DialectHelpers,
     dialect = MD.dialects.Discourse = DialectHelpers.subclassDialect( MD.dialects.Gruber ),
     initialized = false,
-    emitters = [];
+    emitters = [],
+    hoisted;
 
 /**
   Initialize our dialects for processing.
@@ -35,19 +37,18 @@ function processTextNodes(node, event, emitter) {
   if (node.length < 2) { return; }
 
   if (node[0] === '__RAW') {
+    var hash = md5(node[1]);
+    hoisted[hash] = node[1];
+    node[1] = hash;
     return;
   }
 
-  var skipSanitize = [];
   for (var j=1; j<node.length; j++) {
     var textContent = node[j];
     if (typeof textContent === "string") {
       var result = emitter(textContent, event);
       if (result) {
         if (result instanceof Array) {
-          for (var i=0; i<result.length; i++) {
-            skipSanitize[result[i]] = true;
-          }
           node.splice.apply(node, [j, 1].concat(result));
         } else {
           node[j] = result;
@@ -143,6 +144,7 @@ Discourse.Dialect = {
   **/
   cook: function(text, opts) {
     if (!initialized) { initializeDialects(); }
+    hoisted = {};
     dialect.options = opts;
     var tree = parser.toHTMLTree(text, 'Discourse'),
         result = parser.renderJsonML(parseTree(tree));
@@ -156,6 +158,15 @@ Discourse.Dialect = {
       result = opts.sanitizerFunction(result);
     }
 
+    // If we hoisted out anything, put it back
+    var keys = Object.keys(hoisted);
+    if (keys.length) {
+      keys.forEach(function(k) {
+        result = result.replace(k, hoisted[k]);
+      });
+    }
+
+    hoisted = {};
     return result.trim();
   },
 
diff --git a/test/javascripts/mdtest/mdtest.js.erb b/test/javascripts/mdtest/mdtest.js.erb
index f51a94ab2e9..6a9591efdde 100644
--- a/test/javascripts/mdtest/mdtest.js.erb
+++ b/test/javascripts/mdtest/mdtest.js.erb
@@ -22,7 +22,7 @@ function hoistingSanitizer(result) {
     hoisted = [];
     for (var i=0; i<m.length; i++) {
       var c = m[i],
-          id = "discourse:hoisted-comment:" + i;
+          id = md5("discourse:hoisted-comment:" + i);
       result = result.replace(c, id);
       hoisted.push([c, id]);
     }