From dc29509321c8985316d479cca535e6c21c38c12b Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Wed, 14 Oct 2015 11:45:33 +1030
Subject: [PATCH] Evaluate <script> tags in TextFormatter output

This allows us to rely on TextFormatter's highlight.js loading code instead of implementing our own.

closes #532
---
 .../js/forum/src/components/CommentPost.js    | 38 +++----------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/framework/core/js/forum/src/components/CommentPost.js b/framework/core/js/forum/src/components/CommentPost.js
index 5e775f176..cf914eb2d 100644
--- a/framework/core/js/forum/src/components/CommentPost.js
+++ b/framework/core/js/forum/src/components/CommentPost.js
@@ -57,44 +57,18 @@ export default class CommentPost extends Post {
 
     const contentHtml = this.isEditing() ? '' : this.props.post.contentHtml();
 
+    // If the post content has changed since the last render, we'll run through
+    // all of the <script> tags in the content and evaluate them. This is
+    // necessary because TextFormatter outputs them for e.g. syntax highlighting.
     if (context.contentHtml !== contentHtml) {
-      if (typeof hljs === 'undefined') {
-        this.loadHljs();
-      } else {
-        this.$('pre code').each(function(i, elm) {
-          hljs.highlightBlock(elm);
-        });
-      }
+      this.$('.Post-body script').each(function() {
+        eval.call(window, $(this).text());
+      });
     }
 
     context.contentHtml = contentHtml;
   }
 
-  /**
-   * Load the highlight.js library and initialize highlighting when done.
-   *
-   * @private
-   */
-  loadHljs() {
-    const head = document.getElementsByTagName('head')[0];
-
-    const stylesheet = document.createElement('link');
-    stylesheet.type = 'text/css';
-    stylesheet.rel = 'stylesheet';
-    stylesheet.href = '//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/styles/default.min.css';
-    head.appendChild(stylesheet);
-
-    const script = document.createElement('script');
-    script.type = 'text/javascript';
-    script.onload = () => {
-      hljs._ = {};
-      hljs.initHighlighting();
-    };
-    script.async = true;
-    script.src = '//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/highlight.min.js';
-    head.appendChild(script);
-  }
-
   isEditing() {
     return app.composer.component instanceof EditPostComposer &&
       app.composer.component.props.post === this.props.post &&