Merge branch 'MDL-46748-master' of git://github.com/damyon/moodle

diff --git a/filter/mathjaxloader/db/upgrade.php b/filter/mathjaxloader/db/upgrade.php
new file mode 100644 (file)
index 0000000..5c1cde3
--- /dev/null
+++ b/filter/mathjaxloader/db/upgrade.php
@@ -0,0 +1,48 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * MathJAX filter upgrade code.
+ *
+ * @package    filter_mathjaxloader
+ * @copyright  2014 Damyon Wiese (damyon@moodle.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * @param int $oldversion the version we are upgrading from
+ * @return bool result
+ */
+function xmldb_filter_mathjaxloader_upgrade($oldversion) {
+    global $CFG, $DB;
+
+    $dbman = $DB->get_manager();
+
+    // Moodle v2.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    if ($oldversion < 2014081100) {
+
+        $sslcdnurl = get_config('filter_mathjaxloader', 'httpsurl');
+        if ($sslcdnurl === "https://c328740.ssl.cf1.rackcdn.com/mathjax/2.3-latest/MathJax.js") {
+            set_config('httpsurl', 'https://cdn.mathjax.org/mathjax/2.3-latest/MathJax.js', 'filter_mathjaxloader');
+        }
+
+        upgrade_plugin_savepoint(true, 2014081100, 'filter', 'mathjaxloader');
+    }
+
+    return true;
+}

diff --git a/filter/mathjaxloader/settings.php b/filter/mathjaxloader/settings.php
index deeb975..978587c 100644 (file)
--- a/filter/mathjaxloader/settings.php
+++ b/filter/mathjaxloader/settings.php
@@ -40,7 +40,7 @@ if ($ADMIN->fulltree) {
     $item = new admin_setting_configtext('filter_mathjaxloader/httpsurl',
                                          new lang_string('httpsurl', 'filter_mathjaxloader'),
                                          new lang_string('httpsurl_help', 'filter_mathjaxloader'),
-                                         'https://c328740.ssl.cf1.rackcdn.com/mathjax/2.3-latest/MathJax.js',
+                                         'https://cdn.mathjax.org/mathjax/2.3-latest/MathJax.js',
                                          PARAM_RAW);
     $settings->add($item);
 

diff --git a/filter/mathjaxloader/upgrade.txt b/filter/mathjaxloader/upgrade.txt
new file mode 100644 (file)
index 0000000..ca95016
--- /dev/null
+++ b/filter/mathjaxloader/upgrade.txt
@@ -0,0 +1,7 @@
+Setting "httpsurl" default changed from:
+
+https://c328740.ssl.cf1.rackcdn.com/mathjax/2.3-latest/MathJax.js
+
+to:
+
+https://cdn.mathjax.org/mathjax/2.3-latest/MathJax.js

diff --git a/filter/mathjaxloader/version.php b/filter/mathjaxloader/version.php
index 92b4abc..8de1236 100644 (file)
--- a/filter/mathjaxloader/version.php
+++ b/filter/mathjaxloader/version.php
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version  = 2014051200;
+$plugin->version  = 2014081100;
 $plugin->requires = 2014050800;  // Requires this Moodle version
 $plugin->component= 'filter_mathjaxloader';

diff --git a/filter/mathjaxloader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader-debug.js b/filter/mathjaxloader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader-debug.js
index 934906a..1ab45af 100644 (file)
Binary files a/filter/mathjaxloader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader-debug.js and b/filter/mathjaxloader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader-debug.js differ

diff --git a/filter/mathjaxloader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader-min.js b/filter/mathjaxloader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader-min.js
index 0009184..b125c40 100644 (file)
Binary files a/filter/mathjaxloader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader-min.js and b/filter/mathjaxloader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader-min.js differ

diff --git a/filter/mathjaxloader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader.js b/filter/mathjaxloader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader.js
index 934906a..1ab45af 100644 (file)
Binary files a/filter/mathjaxloader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader.js and b/filter/mathjaxloader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader.js differ

diff --git a/filter/mathjaxloader/yui/src/loader/js/loader.js b/filter/mathjaxloader/yui/src/loader/js/loader.js
index 570a84a..0181304 100644 (file)
--- a/filter/mathjaxloader/yui/src/loader/js/loader.js
+++ b/filter/mathjaxloader/yui/src/loader/js/loader.js
@@ -74,11 +74,13 @@ M.filter_mathjaxloader = M.filter_mathjaxloader || {
     _setLocale: function() {
         if (!this._configured) {
             var lang = this._lang;
-            MathJax.Hub.Queue(function () {
-                MathJax.Localization.setLocale(lang);
-            });
-            MathJax.Hub.Configured();
-            this._configured = true;
+            if (typeof MathJax !== "undefined") {
+                MathJax.Hub.Queue(function () {
+                    MathJax.Localization.setLocale(lang);
+                });
+                MathJax.Hub.Configured();
+                this._configured = true;
+            }
         }
     },
 
@@ -93,7 +95,9 @@ M.filter_mathjaxloader = M.filter_mathjaxloader || {
             Y.use('mathjax', function() {
                 self._setLocale();
                 Y.all('.filter_mathjaxloader_equation').each(function(node) {
-                    MathJax.Hub.Queue(["Typeset", MathJax.Hub, node.getDOMNode()]);
+                    if (typeof MathJax !== "undefined") {
+                        MathJax.Hub.Queue(["Typeset", MathJax.Hub, node.getDOMNode()]);
+                    }
                 });
             });
         }
@@ -110,7 +114,9 @@ M.filter_mathjaxloader = M.filter_mathjaxloader || {
             self._setLocale();
             event.nodes.each(function (node) {
                 node.all('.filter_mathjaxloader_equation').each(function(node) {
-                    MathJax.Hub.Queue(["Typeset", MathJax.Hub, node.getDOMNode()]);
+                    if (typeof MathJax !== "undefined") {
+                        MathJax.Hub.Queue(["Typeset", MathJax.Hub, node.getDOMNode()]);
+                    }
                 });
             });
         });