fix(mathjax): remove redundant dollar delimiter config and detection

Dollar delimiters ($...$, $$...$$) are MathJax 3 defaults, so explicit config is redundant. Remove them from config, inline detection, and tests, and simplify the tag-detection logic (no remaining self-matching pairs).

Author: navinkarkera

cms/djangoapps/pipeline_js/js/xmodule.js

@@ -19,12 +19,10 @@ define(
         window.MathJax = {
             tex: {
                 inlineMath: [
-                    ['$', '$'],
                     ['\\(', '\\)'],
                     ['[mathjaxinline]', '[/mathjaxinline]']
                 ],
                 displayMath: [
-                    ['$$', '$$'],
                     ['\\[', '\\]'],
                     ['[mathjax]', '[/mathjax]']
                 ],

cms/static/cms/js/require-config.js

@@ -50,12 +50,10 @@
             window.MathJax = {
                 tex: {
                     inlineMath: [
-                        ['$', '$'],
                         ['\\(', '\\)'],
                         ['[mathjaxinline]', '[/mathjaxinline]']
                     ],
                     displayMath: [
-                        ['$$', '$$'],
                         ['\\[', '\\]'],
                         ['[mathjax]', '[/mathjax]']
                     ],

cms/static/cms/js/spec/main.js

@@ -23,12 +23,10 @@
         window.MathJax = {
             tex: {
                 inlineMath: [
-                    ['$', '$'],
                     ['\\(', '\\)'],
                     ['[mathjaxinline]', '[/mathjaxinline]']
                 ],
                 displayMath: [
-                    ['$$', '$$'],
                     ['\\[', '\\]'],
                     ['[mathjax]', '[/mathjax]']
                 ],

cms/static/cms/js/spec/main_squire.js

@@ -9,12 +9,10 @@
         window.MathJax = {
             tex: {
                 inlineMath: [
-                    ['$', '$'],
                     ['\\(', '\\)'],
                     ['[mathjaxinline]', '[/mathjaxinline]']
                 ],
                 displayMath: [
-                    ['$$', '$$'],
                     ['\\[', '\\]'],
                     ['[mathjax]', '[/mathjax]']
                 ],

common/static/common/js/discussion/mathjax_include.js

@@ -2,12 +2,10 @@ if (typeof MathJax === 'undefined') {
     window.MathJax = {
         tex: {
             inlineMath: [
-                ['$', '$'],
                 ['\\(', '\\)'],
                 ['[mathjaxinline]', '[/mathjaxinline]']
             ],
             displayMath: [
-                ['$$', '$$'],
                 ['\\[', '\\]'],
                 ['[mathjax]', '[/mathjax]']
             ],

common/templates/mathjax_include.html

@@ -43,12 +43,10 @@
   window.MathJax = {
     tex: {
       inlineMath: [
-          ['$', '$'],
           ["\\(","\\)"],
           ['[mathjaxinline]','[/mathjaxinline]']
         ],
       displayMath: [
-          ['$$', '$$'],
           ["\\[","\\]"],
           ['[mathjax]','[/mathjax]']
         ],

common/templates/xblock_v2/xblock_iframe.html

@@ -126,12 +126,10 @@
     window.MathJax = {
       tex: {
         inlineMath: [
-            ['$', '$'],
             ["\\(","\\)"],
             ['[mathjaxinline]','[/mathjaxinline]']
           ],
         displayMath: [
-            ['$$', '$$'],
             ["\\[","\\]"],
             ['[mathjax]','[/mathjax]']
           ],

lms/djangoapps/courseware/tests/test_views.py

@@ -2811,8 +2811,6 @@ def setUp(self):
                     display_name='Vertical with No Mathjax HTML',
                 )
                 MATHJAX_TAG_PAIRS = [
-                    ("$", "$"),
-                    ("$$", "$$"),
                     (r"\(", r"\)"),
                     (r"\[", r"\]"),
                     ("[mathjaxinline]", "[/mathjaxinline]"),
@@ -2833,12 +2831,6 @@ def setUp(self):
                     display_name="HTML Without Mathjax",
                     data="<p>I talk about mathjax, but I have no actual Math!</p>",
                 )
-                self.html_with_lone_dollar = BlockFactory.create(
-                    category='html',
-                    parent_location=self.no_math_vertical.location,
-                    display_name="HTML With Lone Dollar",
-                    data="<p>Price: $5</p>",
-                )
 
         self.course_key = self.course.id
         self.user = UserFactory(username='staff_user', profile__country='AX', is_staff=True)
@@ -2857,8 +2849,6 @@ def test_mathjax_detection(self):
             response = self.client.get(url)
             assert response.status_code == 200
             assert b"window.MathJax" in response.content
-            assert b"['$', '$']" in response.content
-            assert b"['$$', '$$']" in response.content
 
         # Check the one without Math...
         url = reverse("render_xblock", kwargs={
@@ -2868,14 +2858,6 @@ def test_mathjax_detection(self):
         assert response.status_code == 200
         assert b"window.MathJax" not in response.content
 
-        # Check lone dollar sign isn't mistaken for MathJax
-        url = reverse("render_xblock", kwargs={
-            'usage_key_string': str(self.html_with_lone_dollar.location)
-        })
-        response = self.client.get(url)
-        assert response.status_code == 200
-        assert b"window.MathJax" not in response.content
-
         # The containing vertical should still return MathJax (for now)
         url = reverse("render_xblock", kwargs={
             'usage_key_string': str(self.no_math_vertical.location)

lms/djangoapps/courseware/views/views.py

@@ -1802,8 +1802,6 @@ def has_mathjax_content(self):
         # The following pairs are used to mark Mathjax syntax in XBlocks. There
         # are other options for the wiki, but we don't worry about those here.
         MATHJAX_TAG_PAIRS = [
-            ("$", "$"),
-            ("$$", "$$"),
             (r"\(", r"\)"),
             (r"\[", r"\]"),
             ("[mathjaxinline]", "[/mathjaxinline]"),
@@ -1812,8 +1810,7 @@ def has_mathjax_content(self):
         content = self.fragment.body_html()
         for (start_tag, end_tag) in MATHJAX_TAG_PAIRS:
             if start_tag in content and end_tag in content:
-                if start_tag != end_tag or content.count(start_tag) >= 2:
-                    return True
+                return True
 
         return False
 

lms/static/lms/js/spec/main.js

@@ -9,12 +9,10 @@
         window.MathJax = {
             tex: {
                 inlineMath: [
-                    ['$', '$'],
                     ['\\(', '\\)'],
                     ['[mathjaxinline]', '[/mathjaxinline]']
                 ],
                 displayMath: [
-                    ['$$', '$$'],
                     ['\\[', '\\]'],
                     ['[mathjax]', '[/mathjax]']
                 ],