L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-46748-27' of git://github.com/damyon/moodle into MOODLE_27_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2014-08-11 08:37:35 +01:00
parent 4f88c9f38d c49e848571
commit 61d3898de9
8 changed files with 97 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filter/mathjaxloader/db/upgrade.php
+48
View File
@@ -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 ([email protected])
* @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 < 2014051201) {
$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, 2014051201, 'filter', 'mathjaxloader');
}
return true;
}
filter/mathjaxloader/settings.php
+1 -1
View File
@@ -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);
filter/mathjaxloader/upgrade.txt
+7
View File
@@ -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
filter/mathjaxloader/version.php
+1 -1
View File
@@ -24,6 +24,6 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2014051200;
$plugin->version = 2014051201;
$plugin->requires = 2014050800; // Requires this Moodle version
$plugin->component= 'filter_mathjaxloader';
filter/mathjaxloader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader-debug.js
Vendored
+13 -7
View File
@@ -76,11 +76,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;
}
}
},
@@ -95,7 +97,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()]);
}
});
});
}
@@ -112,7 +116,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()]);
}
});
});
});
filter/mathjaxloader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader-min.js
Vendored
+1 -1
View File
@@ -1 +1 @@
YUI.add("moodle-filter_mathjaxloader-loader",function(e,t){M.filter_mathjaxloader=M.filter_mathjaxloader||{_lang:"",_configured:!1,configure:function(t){var n=document.createElement("script");n.type="text/x-mathjax-config",n[window.opera?"innerHTML":"text"]=t.mathjaxconfig,document.getElementsByTagName("head")[0].appendChild(n),this._lang=t.lang,e.on(M.core.event.FILTER_CONTENT_UPDATED,this.contentUpdated,this)},_setLocale:function(){if(!this._configured){var e=this._lang;MathJax.Hub.Queue(function(){MathJax.Localization.setLocale(e)}),MathJax.Hub.Configured(),this._configured=!0}},typeset:function(){if(!this._configured){var t=this;e.use("mathjax",function(){t._setLocale(),e.all(".filter_mathjaxloader_equation").each(function(e){MathJax.Hub.Queue(["Typeset",MathJax.Hub,e.getDOMNode()])})})}},contentUpdated:function(t){var n=this;e.use("mathjax",function(){n._setLocale(),t.nodes.each(function(e){e.all(".filter_mathjaxloader_equation").each(function(e){MathJax.Hub.Queue(["Typeset",MathJax.Hub,e.getDOMNode()])})})})}}},"@VERSION@",{requires:["moodle-core-event"]});
YUI.add("moodle-filter_mathjaxloader-loader",function(e,t){M.filter_mathjaxloader=M.filter_mathjaxloader||{_lang:"",_configured:!1,configure:function(t){var n=document.createElement("script");n.type="text/x-mathjax-config",n[window.opera?"innerHTML":"text"]=t.mathjaxconfig,document.getElementsByTagName("head")[0].appendChild(n),this._lang=t.lang,e.on(M.core.event.FILTER_CONTENT_UPDATED,this.contentUpdated,this)},_setLocale:function(){if(!this._configured){var e=this._lang;typeof MathJax!="undefined"&&(MathJax.Hub.Queue(function(){MathJax.Localization.setLocale(e)}),MathJax.Hub.Configured(),this._configured=!0)}},typeset:function(){if(!this._configured){var t=this;e.use("mathjax",function(){t._setLocale(),e.all(".filter_mathjaxloader_equation").each(function(e){typeof MathJax!="undefined"&&MathJax.Hub.Queue(["Typeset",MathJax.Hub,e.getDOMNode()])})})}},contentUpdated:function(t){var n=this;e.use("mathjax",function(){n._setLocale(),t.nodes.each(function(e){e.all(".filter_mathjaxloader_equation").each(function(e){typeof MathJax!="undefined"&&MathJax.Hub.Queue(["Typeset",MathJax.Hub,e.getDOMNode()])})})})}}},"@VERSION@",{requires:["moodle-core-event"]});
filter/mathjaxloader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader.js
Vendored
+13 -7
View File
@@ -76,11 +76,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;
}
}
},
@@ -95,7 +97,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()]);
}
});
});
}
@@ -112,7 +116,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()]);
}
});
});
});
filter/mathjaxloader/yui/src/loader/js/loader.js
Vendored
+13 -7
View File
@@ -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()]);
}
});
});
});