From 71ab971c723c8762d5388464b3ecb6ae18050ecf Mon Sep 17 00:00:00 2001
From: Adam Palay <adam@edx.org>
Date: Tue, 17 Mar 2015 10:44:48 -0400
Subject: [PATCH] Revert "Lms should be independent of mathjax"

This reverts commit 4a086f54d51f37153f71a1d2079ef742060c978a.
---
 common/templates/mathjax_include.html | 57 ++++++++++++---------------
 lms/static/require-config-lms.js      |  1 -
 2 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/common/templates/mathjax_include.html b/common/templates/mathjax_include.html
index d3fef03ec2..bb0c14ece9 100644
--- a/common/templates/mathjax_include.html
+++ b/common/templates/mathjax_include.html
@@ -6,38 +6,33 @@
 ## This enables ASCIIMathJAX, and is used by js_textbox
 
 
-<%def name="mathjaxConfig()">
-  %if mathjax_mode is not Undefined and mathjax_mode == 'wiki':
-    MathJax.Hub.Config({
-      tex2jax: {inlineMath: [ ['$','$'], ["\\(","\\)"]],
-                displayMath: [ ['$$','$$'], ["\\[","\\]"]]}
-    });
-  %else:
-    MathJax.Hub.Config({
-      tex2jax: {
-        inlineMath: [
-          ["\\(","\\)"],
-          ['[mathjaxinline]','[/mathjaxinline]']
-        ],
-        displayMath: [
-          ["\\[","\\]"],
-          ['[mathjax]','[/mathjax]']
-        ]
-      }
-    });
-  %endif
-  MathJax.Hub.Configured();
-  window.HUB = MathJax.Hub;
-</%def>
+%if mathjax_mode is not Undefined and mathjax_mode == 'wiki':
+<script type="text/x-mathjax-config">
+  MathJax.Hub.Config({
+    tex2jax: {inlineMath: [ ['$','$'], ["\\(","\\)"]],
+              displayMath: [ ['$$','$$'], ["\\[","\\]"]]}
+  });
+  HUB = MathJax.Hub
+</script>
+%else:
+<script type="text/x-mathjax-config">
+  MathJax.Hub.Config({
+    tex2jax: {
+      inlineMath: [
+        ["\\(","\\)"],
+        ['[mathjaxinline]','[/mathjaxinline]']
+      ],
+      displayMath: [
+        ["\\[","\\]"],
+        ['[mathjax]','[/mathjax]']
+      ]
+    }
+  });
+  HUB = MathJax.Hub
+</script>
+%endif
 
 <!-- This must appear after all mathjax-config blocks, so it is after the imports from the other templates.
      It can't be run through static.url because MathJax uses crazy url introspection to do lazy loading of
      MathJax extension libraries -->
-<script type="text/javascript">
-  ;(function (require) {
-  'use strict';
-  require(['mathjax'], function() {
-      ${mathjaxConfig()}
-  });
-  }).call(this, require || RequireJS.require);
-</script>
+<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/2.4-latest/MathJax.js?config=TeX-MML-AM_HTMLorMML-full"></script>
diff --git a/lms/static/require-config-lms.js b/lms/static/require-config-lms.js
index 50b3404f24..3530432f09 100644
--- a/lms/static/require-config-lms.js
+++ b/lms/static/require-config-lms.js
@@ -67,7 +67,6 @@
             "ova": 'js/vendor/ova/ova',
             "catch": 'js/vendor/ova/catch/js/catch',
             "handlebars": 'js/vendor/ova/catch/js/handlebars-1.1.2',
-            "mathjax": 'https://cdn.mathjax.org/mathjax/2.4-latest/MathJax.js?config=TeX-MML-AM_HTMLorMML-full'
             // end of files needed by OVA
         },
         shim: {