Split duplicated math scripts to separate file

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Apr 12, 2017 · da60e7a · da60e7a
1 parent 71af9a8
commit da60e7a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 52 deletions.
diff --git a/nikola/data/themes/base/templates/index_helper.tmpl b/nikola/data/themes/base/templates/index_helper.tmpl
@@ -1,4 +1,5 @@
 ## -*- coding: utf-8 -*-
+<%namespace name="math" file="math_helper.tmpl"/>
 <%def name="html_pager()">
     %if prevlink or nextlink:
         <nav class="postindexpager">
@@ -20,31 +21,6 @@
 
 <%def name="mathjax_script(posts)">
     %if any(post.is_mathjax for post in posts):
-        %if use_katex:
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/katex.min.js" integrity="sha384-/y1Nn9+QQAipbNQWU65krzJralCnuOasHncUFXGkdwntGeSvQicrYkiUBwsgUqc1" crossorigin="anonymous"></script>
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/contrib/auto-render.min.js" integrity="sha256-ExtbCSBuYA7kq1Pz362ibde9nnsHYPt6JxuxYeZbU+c=" crossorigin="anonymous"></script>
-            % if katex_auto_render:
-                <script>
-                    renderMathInElement(document.body,
-                        {
-                            ${katex_auto_render}
-                        }
-                    );
-                </script>
-            % else:
-                <script>
-                    renderMathInElement(document.body);
-                </script>
-            % endif
-        %else:
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" integrity="sha256-yYfngbEKv4RENfGDvNUqJTqGFcKf31NJEe9OTnnMH3Y=" crossorigin="anonymous"></script>
-            % if mathjax_config:
-            ${mathjax_config}
-            % else:
-            <script type="text/x-mathjax-config">
-            MathJax.Hub.Config({tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}});
-            </script>
-            % endif
-        %endif
+    ${math.math_script()}
     %endif
 </%def>
diff --git a/nikola/data/themes/base/templates/math_helper.tmpl b/nikola/data/themes/base/templates/math_helper.tmpl
@@ -0,0 +1,28 @@
+<%def name="math_scripts()">
+    %if use_katex:
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/katex.min.js" integrity="sha384-/y1Nn9+QQAipbNQWU65krzJralCnuOasHncUFXGkdwntGeSvQicrYkiUBwsgUqc1" crossorigin="anonymous"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/contrib/auto-render.min.js" integrity="sha256-ExtbCSBuYA7kq1Pz362ibde9nnsHYPt6JxuxYeZbU+c=" crossorigin="anonymous"></script>
+        % if katex_auto_render:
+            <script>
+                renderMathInElement(document.body,
+                    {
+                        ${katex_auto_render}
+                    }
+                );
+            </script>
+        % else:
+            <script>
+                renderMathInElement(document.body);
+            </script>
+        % endif
+    %else:
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" integrity="sha256-yYfngbEKv4RENfGDvNUqJTqGFcKf31NJEe9OTnnMH3Y=" crossorigin="anonymous"></script>
+        % if mathjax_config:
+        ${mathjax_config}
+        % else:
+        <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}});
+        </script>
+        % endif
+    %endif
+</%def>
diff --git a/nikola/data/themes/base/templates/post_helper.tmpl b/nikola/data/themes/base/templates/post_helper.tmpl
@@ -1,4 +1,5 @@
 ## -*- coding: utf-8 -*-
+<%namespace name="math" file="math_helper.tmpl"/>
 
 <%def name="meta_translations(post)">
     %if len(translations) > 1:
@@ -86,31 +87,6 @@
 
 <%def name="mathjax_script(post)">
     %if post.is_mathjax:
-        %if use_katex:
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/katex.min.js" integrity="sha384-/y1Nn9+QQAipbNQWU65krzJralCnuOasHncUFXGkdwntGeSvQicrYkiUBwsgUqc1" crossorigin="anonymous"></script>
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/contrib/auto-render.min.js" integrity="sha256-ExtbCSBuYA7kq1Pz362ibde9nnsHYPt6JxuxYeZbU+c=" crossorigin="anonymous"></script>
-            % if katex_auto_render:
-                <script>
-                    renderMathInElement(document.body,
-                        {
-                            ${katex_auto_render}
-                        }
-                    );
-                </script>
-            % else:
-                <script>
-                    renderMathInElement(document.body);
-                </script>
-            % endif
-        %else:
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" integrity="sha256-yYfngbEKv4RENfGDvNUqJTqGFcKf31NJEe9OTnnMH3Y=" crossorigin="anonymous"></script>
-            % if mathjax_config:
-            ${mathjax_config}
-            % else:
-            <script type="text/x-mathjax-config">
-            MathJax.Hub.Config({tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}});
-            </script>
-            % endif
-        %endif
+        ${math.math_script()}
     %endif
 </%def>