From 16ad61bf552ef2077d565237290ef11a26ec9cab Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Wed, 9 Apr 2014 16:44:40 +0800 Subject: [PATCH] MDL-43856 MathJax: Delay setting of lang until after MathJax startup --- .../moodle-filter_mathjaxloader-loader-debug.js | 5 ++++- .../moodle-filter_mathjaxloader-loader-min.js | 2 +- .../moodle-filter_mathjaxloader-loader.js | 5 ++++- filter/mathjaxloader/yui/src/loader/js/loader.js | 5 ++++- 4 files changed, 13 insertions(+), 4 deletions(-) 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 15f0c756eea..934906a0ffb 100644 --- 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 @@ -75,7 +75,10 @@ M.filter_mathjaxloader = M.filter_mathjaxloader || { */ _setLocale: function() { if (!this._configured) { - MathJax.Localization.setLocale(this._lang); + var lang = this._lang; + MathJax.Hub.Queue(function () { + MathJax.Localization.setLocale(lang); + }); MathJax.Hub.Configured(); this._configured = true; } 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 a5cd7f1a411..0009184a267 100644 --- 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 @@ -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(){this._configured||(MathJax.Localization.setLocale(this._lang),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;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"]}); 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 15f0c756eea..934906a0ffb 100644 --- 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 @@ -75,7 +75,10 @@ M.filter_mathjaxloader = M.filter_mathjaxloader || { */ _setLocale: function() { if (!this._configured) { - MathJax.Localization.setLocale(this._lang); + var lang = this._lang; + MathJax.Hub.Queue(function () { + MathJax.Localization.setLocale(lang); + }); MathJax.Hub.Configured(); this._configured = true; } diff --git a/filter/mathjaxloader/yui/src/loader/js/loader.js b/filter/mathjaxloader/yui/src/loader/js/loader.js index fb7fe1be167..570a84ad5d3 100644 --- a/filter/mathjaxloader/yui/src/loader/js/loader.js +++ b/filter/mathjaxloader/yui/src/loader/js/loader.js @@ -73,7 +73,10 @@ M.filter_mathjaxloader = M.filter_mathjaxloader || { */ _setLocale: function() { if (!this._configured) { - MathJax.Localization.setLocale(this._lang); + var lang = this._lang; + MathJax.Hub.Queue(function () { + MathJax.Localization.setLocale(lang); + }); MathJax.Hub.Configured(); this._configured = true; }