commit c6d73f468931aaf02788161ef0de43019874cba8
parent 833b69cd2ce8f9d46b69df7dc4603795dfc9e384
Author: Davide P. Cervone <dpvc@union.edu>
Date: Tue, 22 Apr 2014 12:31:03 -0400
Fix several loading issues with localization files (don't add menu div until files are loaded, and properly handle empty callbacks in loadDomain).
Diffstat:
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/unpacked/MathJax.js b/unpacked/MathJax.js
@@ -1396,7 +1396,7 @@ MathJax.Localization = {
// directory and file.
//
loadFile: function (file,data,callback) {
- callback = MathJax.Callback(callback||{});
+ callback = MathJax.Callback(callback);
file = (data.file || file); // the data's file name or the default name
if (!file.match(/\.js$/)) {file += ".js"} // add .js if needed
//
@@ -1435,7 +1435,7 @@ MathJax.Localization = {
if (load) {
return MathJax.Callback.Queue(
load,["loadDomain",this,domain] // call again to load domain
- ).Push(callback);
+ ).Push(callback||{});
}
}
if (localeData.domains && domain in localeData.domains) {
diff --git a/unpacked/extensions/MathMenu.js b/unpacked/extensions/MathMenu.js
@@ -200,7 +200,7 @@
SIGNAL.Post(["post",MENU.jax]);
MENU.isRTL = (MathJax.Localization.fontDirection() === "rtl");
}
- var menu = HTML.addElement(div,"div",{
+ var menu = HTML.Element("div",{
onmouseup: MENU.Mouseup, ondblclick: FALSE,
ondragstart: FALSE, onselectstart: FALSE, oncontextmenu: FALSE,
menuItem: this, className: "MathJax_Menu"
@@ -214,6 +214,8 @@
ontouchstart: MENU.Close, ontouchend: FALSE, onmousedown: MENU.Close, onmouseup: FALSE
},[["img",{src: CONFIG.closeImg, style:{width:"100%",height:"100%"}}]]);
}
+
+ div.appendChild(menu);
this.posted = true;
menu.style.width = (menu.offsetWidth+2) + "px";