MDL-48543 Mathjax: Update default config for JAWS Math player

JAWS Maths player does not recognise the math content when manually specifying the config for MathJax.
If you use one of the default config files it works.
So - we switch our config to the Accessible.js config that it is based off anyway.
There are no features changes with this approach.

Conflicts:
	filter/mathjaxloader/version.php

diff --git a/filter/mathjaxloader/db/upgrade.php b/filter/mathjaxloader/db/upgrade.php
index 0d28495..fcbf7c1 100644 (file)
--- a/filter/mathjaxloader/db/upgrade.php
+++ b/filter/mathjaxloader/db/upgrade.php
@@ -46,6 +46,47 @@ function xmldb_filter_mathjaxloader_upgrade($oldversion) {
 
     // Moodle v2.8.0 release upgrade line.
     // Put any upgrade step following this.
+    if ($oldversion < 2015013000) {
+
+        $oldconfig = get_config('filter_mathjaxloader', 'mathjaxconfig');
+        $olddefault = 'MathJax.Hub.Config({
+    config: ["MMLorHTML.js", "Safe.js"],
+    jax: ["input/TeX","input/MathML","output/HTML-CSS","output/NativeMML"],
+    extensions: ["tex2jax.js","mml2jax.js","MathMenu.js","MathZoom.js"],
+    TeX: {
+        extensions: ["AMSmath.js","AMSsymbols.js","noErrors.js","noUndefined.js"]
+    },
+    menuSettings: {
+        zoom: "Double-Click",
+        mpContext: true,
+        mpMouse: true
+    },
+    errorSettings: { message: ["!"] },
+    skipStartupTypeset: true,
+    messageStyle: "none"
+});
+';
+        $newdefault = '
+MathJax.Hub.Config({
+    config: ["Accessible.js", "Safe.js"],
+    errorSettings: { message: ["!"] },
+    skipStartupTypeset: true,
+    messageStyle: "none"
+});
+';
+
+        // Ignore white space changes.
+        $oldconfig = trim(preg_replace('/\s+/', ' ', $oldconfig));
+        $olddefault = trim(preg_replace('/\s+/', ' ', $olddefault));
+
+        // Update the default config for mathjax only if it has not been customised.
+
+        if ($oldconfig == $olddefault) {
+            set_config('mathjaxconfig', $newdefault, 'filter_mathjaxloader');
+        }
+
+        upgrade_plugin_savepoint(true, 2015013000, 'filter', 'mathjaxloader');
+    }
 
     if ($oldversion < 2015021200) {
 

diff --git a/filter/mathjaxloader/settings.php b/filter/mathjaxloader/settings.php
index 1ca7670..2c681f0 100644 (file)
--- a/filter/mathjaxloader/settings.php
+++ b/filter/mathjaxloader/settings.php
@@ -52,17 +52,7 @@ if ($ADMIN->fulltree) {
 
     $default = '
 MathJax.Hub.Config({
-    config: ["MMLorHTML.js", "Safe.js"],
-    jax: ["input/TeX","input/MathML","output/HTML-CSS","output/NativeMML"],
-    extensions: ["tex2jax.js","mml2jax.js","MathMenu.js","MathZoom.js"],
-    TeX: {
-        extensions: ["AMSmath.js","AMSsymbols.js","noErrors.js","noUndefined.js"]
-    },
-    menuSettings: {
-        zoom: "Double-Click",
-        mpContext: true,
-        mpMouse: true
-    },
+    config: ["Accessible.js", "Safe.js"],
     errorSettings: { message: ["!"] },
     skipStartupTypeset: true,
     messageStyle: "none"

diff --git a/filter/mathjaxloader/version.php b/filter/mathjaxloader/version.php
index 21e2f19..a47e1cd 100644 (file)
--- a/filter/mathjaxloader/version.php
+++ b/filter/mathjaxloader/version.php
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version  = 2015021200;
+$plugin->version  = 2015021700;
 $plugin->requires = 2014110400;  // Requires this Moodle version
 $plugin->component= 'filter_mathjaxloader';