Merge branch 'MDL-43856-master-fix1' of https://github.com/damyon/moodle

robjoyce · Apr 9, 2014 · 1a19494 · 1a19494
2 parents 21fd238 + 16ad61b
commit 1a19494
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/.../yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader-debug.js b/.../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/...er/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader-min.js b/...er/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader-min.js
diff --git a/...loader/yui/build/moodle-filter_mathjaxloader-loader/moodle-filter_mathjaxloader-loader.js b/...loader/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
@@ -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;
         }