Using bigger wrappers for MathJax. This improves speed by a lot, arou…

…nd 2-3 times faster.
KQMATH · Oct 31, 2018 · c2f7bfe · c2f7bfe
1 parent 0f13d53
commit c2f7bfe
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 26 deletions.
diff --git a/amd/build/core.min.js b/amd/build/core.min.js
diff --git a/amd/build/instructor.min.js b/amd/build/instructor.min.js
diff --git a/amd/src/core.js b/amd/src/core.js
@@ -21,7 +21,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-define(['jquery', 'core/config', 'core/str', 'core/yui'], function ($, mConfig, mString, Y) {
+define(['jquery', 'core/config', 'core/str', 'core/yui', 'core/event'], function ($, mConfig, mString, Y, mEvent) {
 
     // Contains the needed values for using the ajax script.
     let session = {
@@ -320,9 +320,7 @@ define(['jquery', 'core/config', 'core/str', 'core/yui'], function ($, mConfig,
          * Triggers a dynamic content update event, which MathJax listens to.
          */
         static renderAllMathjax() {
-            Y.fire(M.core.event.FILTER_CONTENT_UPDATED, {
-                nodes: new Y.NodeList(document.getElementsByClassName('jazzquiz-latex-wrapper'))
-            });
+            mEvent.notifyFilterContentUpdated(document.getElementsByClassName('jazzquiz-response-container'));
         }
 
         /**
@@ -331,7 +329,7 @@ define(['jquery', 'core/config', 'core/str', 'core/yui'], function ($, mConfig,
          * @param {string} latex
          */
         static addMathjaxElement($target, latex) {
-            $target.html('<span class="jazzquiz-latex-wrapper"><span class="filter_mathjaxloader_equation">' + latex + '</span></span>');
+            $target.html('<span class="filter_mathjaxloader_equation">' + latex + '</span>');
             Quiz.renderAllMathjax();
         }
 

diff --git a/amd/src/instructor.js b/amd/src/instructor.js
@@ -884,8 +884,7 @@ define(['jquery', 'mod_jazzquiz/core'], function ($, Jazz) {
                 return;
             }
             Ajax.get('get_right_response', {}, data => {
-                const answer = '<span class="jazzquiz-latex-wrapper">' + data.right_answer + '</span>';
-                Quiz.show(Instructor.correctAnswer.html(answer));
+                Quiz.show(Instructor.correctAnswer.html(data.right_answer));
                 Quiz.renderAllMathjax();
                 Quiz.check(Instructor.control('answer'));
                 this.isShowingCorrectAnswer = true;

diff --git a/templates/edit_question_list.mustache b/templates/edit_question_list.mustache
@@ -1,4 +1,4 @@
-<div class="generalbox boxaligncenter jazzquiz-box">
+<div class="generalbox boxaligncenter jazzquiz-box jazzquiz-response-container">
     <div id="questionrow" class="row">
         <div class="inline-block span6">
             <h2>{{# str }} questions, jazzquiz {{/ str }}</h2>
@@ -13,10 +13,8 @@
                                 {{{ icon }}}
                             </div>
                             <div class="name">
-                                <span class="jazzquiz-latex-wrapper">
-                                    <span class="filter_mathjaxloader_equation">
-                                        {{{ name }}}
-                                    </span>
+                                <span class="filter_mathjaxloader_equation">
+                                    {{{ name }}}
                                 </span>
                             </div>
                             {{# first }}{{# pix }} spacer, core {{/ pix }}{{/ first }}

diff --git a/templates/quiz.mustache b/templates/quiz.mustache
@@ -22,7 +22,7 @@
             <div id="jazzquiz_control_separator"></div>
         </div>
     </div>
-    <div id="jazzquiz_correct_answer_container" class="jazzquiz-box hidden"></div>
+    <div id="jazzquiz_correct_answer_container" class="jazzquiz-response-container jazzquiz-box hidden"></div>
     <div id="jazzquiz_side_container" class="jazzquiz-box">
         <div id="jazzquiz_responded_container" class="jazzquiz-box">
             <div>
@@ -46,6 +46,6 @@
             <i class="fa fa-undo"></i>
         </button>
     </div>
-    <div id="jazzquiz_responses_container" class="jazzquiz-box hidden"></div>
+    <div id="jazzquiz_responses_container" class="jazzquiz-response-container jazzquiz-box hidden"></div>
     {{/ instructor }}
 </div>
diff --git a/templates/report.mustache b/templates/report.mustache
@@ -20,20 +20,16 @@
                 {{# str }} download_report, jazzquiz {{/str}}
             </a>
         </div>
-        <div id="report_overview_responses" class="hidden">
+        <div id="report_overview_responses" class="jazzquiz-response-container hidden">
             {{# slots }}
                 <div class="jazzquiz-box">
                     <h2>
-                        <span class="jazzquiz-latex-wrapper">
-                            <span class="filter_mathjaxloader_equation">
+                        <span class="filter_mathjaxloader_equation">
                                 {{{ name }}}
-                            </span>
                         </span>
                     </h2>
-                    <span class="jazzquiz-latex-wrapper">
-                        <span class="filter_mathjaxloader_equation">
-                            {{{ description }}}
-                        </span>
+                    <span class="filter_mathjaxloader_equation">
+                        {{{ description }}}
                     </span>
                     <table id="responses_wrapper_table_{{ num }}" class="jazzquiz-responses-overview"></table>
                     <br>

diff --git a/version.php b/version.php
@@ -24,9 +24,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2018103101; // The current module version (Date: YYYYMMDDXX)
+$plugin->version = 2018103102; // The current module version (Date: YYYYMMDDXX)
 $plugin->requires = 2016052304; // Moodle 3.1 (or above)
 $plugin->cron = 0; // Period in seconds for cron to run.
 $plugin->component = 'mod_jazzquiz';
 $plugin->maturity = MATURITY_STABLE;
-$plugin->release = '0.9.1 (Build: 2018103101)';
+$plugin->release = '0.9.1 (Build: 2018103102)';