From bdbbf85803b5418bff8f9f45fbdd3b4a7cada9b6 Mon Sep 17 00:00:00 2001 From: Attila-Mihaly Balazs Date: Thu, 31 May 2012 15:59:34 +0300 Subject: [PATCH] Added optional MathJax support --- forum/settings/static.py | 7 ++++++- .../media/js.src/pagedown/Markdown-combo.js | 1 + .../media/js.src/pagedown/Markdown.Editor.js | 1 + forum/skins/default/media/js.src/wmd/wmd.js | 1 + forum/skins/default/templates/base_content.html | 15 +++++++++++++++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/forum/settings/static.py b/forum/settings/static.py index 9eb5d394..c402ca46 100644 --- a/forum/settings/static.py +++ b/forum/settings/static.py @@ -103,4 +103,9 @@ label = _("Custom Head"), help_text = _("Your custom Head elements."), widget=Textarea(attrs={'rows': '25'}), - required=False)) \ No newline at end of file + required=False)) + +MATHJAX_ENABLED = Setting('MATHJAX_ENABLED', False, HEAD_SET, dict( + label = _("Enable LaTeX support"), + help_text = _("Enable LaTeX support via MathJax, by loading MathJax javascript"), + required=False)) diff --git a/forum/skins/default/media/js.src/pagedown/Markdown-combo.js b/forum/skins/default/media/js.src/pagedown/Markdown-combo.js index 581d8971..aeba9228 100644 --- a/forum/skins/default/media/js.src/pagedown/Markdown-combo.js +++ b/forum/skins/default/media/js.src/pagedown/Markdown-combo.js @@ -2269,6 +2269,7 @@ else elapsedTime = currTime - prevTime; pushPreviewHtml(text); + if (MathJax) { MathJax.Hub.Queue(["Typeset",MathJax.Hub]); } }; // setTimeout is already used. Used as an event listener. diff --git a/forum/skins/default/media/js.src/pagedown/Markdown.Editor.js b/forum/skins/default/media/js.src/pagedown/Markdown.Editor.js index 7f775d87..8aaab4b5 100644 --- a/forum/skins/default/media/js.src/pagedown/Markdown.Editor.js +++ b/forum/skins/default/media/js.src/pagedown/Markdown.Editor.js @@ -829,6 +829,7 @@ elapsedTime = currTime - prevTime; pushPreviewHtml(text); + if (MathJax) { MathJax.Hub.Queue(["Typeset",MathJax.Hub]); } }; // setTimeout is already used. Used as an event listener. diff --git a/forum/skins/default/media/js.src/wmd/wmd.js b/forum/skins/default/media/js.src/wmd/wmd.js index ac03ea28..ad4b2104 100644 --- a/forum/skins/default/media/js.src/wmd/wmd.js +++ b/forum/skins/default/media/js.src/wmd/wmd.js @@ -1919,6 +1919,7 @@ Attacklab.wmdBase = function(){ pushPreviewHtml(text); htmlOut = text; + if (MathJax) { MathJax.Hub.Queue(["Typeset",MathJax.Hub]); } }; // setTimeout is already used. Used as an event listener. diff --git a/forum/skins/default/templates/base_content.html b/forum/skins/default/templates/base_content.html index b96f0283..de290969 100644 --- a/forum/skins/default/templates/base_content.html +++ b/forum/skins/default/templates/base_content.html @@ -60,6 +60,21 @@ {% include "base_onready.html" %} + {% if settings.MATHJAX_ENABLED %} + + + {% endif %} {% if settings.USE_PJAX %}