Merge pull request #67 from prasanna-lmsace/moodle_44_dev

Improvement: Update for Moodle 4.4 compatibility and improved MathJax support 1658984705

amd/src/initmathjax-backward.js

@@ -0,0 +1,22 @@
+define(["jquery", "core/ajax"], function ($, Ajax) {
+  return {
+    init: function () {
+      $(document).ready(function () {
+        // Initialise MathJax typesetting
+        var nodes = Y.all(".latex-math");
+        Y.fire(M.core.event.FILTER_CONTENT_UPDATED, { nodes: nodes });
+
+        var waitForMathJax = setInterval(function () {
+          try {
+            if (MathJax) {
+              MathJax.Hub.Queue(["Typeset", MathJax.Hub]);
+              clearInterval(waitForMathJax);
+            }
+          } catch (e) {
+            // MathJax has not yet been loaded.
+          }
+        }, 100);
+      });
+    },
+  };
+});

amd/src/initmathjax.js

@@ -1,22 +1,56 @@
-define(["jquery", "core/ajax"], function ($, Ajax) {
-  return {
-    init: function () {
-      $(document).ready(function () {
-        // Initialise MathJax typesetting
-        var nodes = Y.all(".latex-math");
-        Y.fire(M.core.event.FILTER_CONTENT_UPDATED, { nodes: nodes });
-
-        var waitForMathJax = setInterval(function () {
-          try {
-            if (MathJax) {
-              MathJax.Hub.Queue(["Typeset", MathJax.Hub]);
-              clearInterval(waitForMathJax);
+define(["jquery", "core/ajax", "core_filters/events"], function ($, Ajax, FilterEvents) {
+
+    // Selectors and other strings defined here.
+    const SELECTORS = {
+        root: '.monassis',
+        mathEquation: '.latex-math',
+        questionContent: '.question-content',
+        classes: {
+            filterMathjax: 'filter_mathjaxloader_equation'
+        }
+    };
+
+    // Parent element of the questions.
+    const root = document.querySelector(SELECTORS.root);
+
+    const mathJaxFilterByEvents = function() {
+
+        /**
+         * Update the equations by mathjax filter.
+         */
+        function updateMathJax() {
+
+            if (root.querySelector(SELECTORS.questionContent) === null) {
+                return false;
+            }
+
+            // Initialise MathJax typesetting.
+            root.querySelector(SELECTORS.questionContent).classList.add(SELECTORS.classes.filterMathjax);
+            // Notifiy the siyavula filtered content are updated.
+            FilterEvents.notifyFilterContentUpdated(document.querySelectorAll(SELECTORS.root));
+
+            return true;
+
+        }
+
+        // Update the equations, if the content loaded before JS initiated.
+        var waitForMathJax = setInterval(function() {
+            try {
+                if (window.MathJax && updateMathJax()) {
+                    window.MathJax.Hub.Queue(["Typeset", window.MathJax.Hub]);
+                    clearInterval(waitForMathJax);
+                }
+            } catch (e) {
+                // MathJax has not yet been loaded.
             }
-          } catch (e) {
-            // MathJax has not yet been loaded.
-          }
         }, 100);
-      });
-    },
-  };
+
+    };
+
+    return {
+
+        init: function () {
+            mathJaxFilterByEvents();
+        },
+    };
 });

classes/renderables/activity_renderable.php

@@ -22,4 +22,6 @@ class activity_renderable implements \renderable {
     public $token;
     public $usertoken;
     public $activitytype;
+    public $showlivepreview;
+    public $templatelist;
 }

filter.php

@@ -134,7 +134,8 @@ public function filter($text, array $options = array()) {
         $showlivepreview = $siyavulaconfig->showlivepreview;
         $baseurl = $siyavulaconfig->url_base;
 
-        $result = $PAGE->requires->js_call_amd('filter_siyavula/initmathjax', 'init');
+
+        $result = '';
 
         if ($activitytype == 'standalone') {
             list($templateid, $randomseed) = $this->get_standalone_activity_data($text);
@@ -214,9 +215,19 @@ public function filter($text, array $options = array()) {
 
         // Render questions not apply format siyavula.
         if (!empty($result)) {
+
+            // Current version is Moodle 3.9 or higher use the event types. Otherwise use the older versions.
+            if ($CFG->version >= 2022041904) {
+                $PAGE->requires->js_call_amd('filter_siyavula/initmathjax', 'init');
+            } else {
+                $PAGE->requires->js_call_amd('filter_siyavula/initmathjax-backward', 'init');
+            }
+
             return $result;
+
         } else {
             return $text;
         }
+
     }
 }

styles.css

@@ -21,4 +21,4 @@
 
 form#form_test_token{
     padding-top: 60px;
-}
+}

version.php

@@ -1,7 +1,7 @@
 <?php
 
 defined('MOODLE_INTERNAL') || die();
-$plugin->version   = 2023121300;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->version   = 2023121301;        // The current plugin version (Date: YYYYMMDDXX)
 $plugin->requires  = 2019111809;        // Requires this Moodle version
 $plugin->component = 'filter_siyavula'; // Full name of the plugin (used for diagnostics)
 $plugin->maturity = MATURITY_STABLE;