Add jax parameter to getTabOrder() so that, if overridden, you can identify the jax (and it asociated script).

This commit is contained in:
Davide P. Cervone 2016-02-06 10:35:31 -05:00
parent a597f2107e
commit d1a569c905
8 changed files with 10 additions and 10 deletions

View File

@ -2368,14 +2368,14 @@ MathJax.Hub = {
error.oncontextmenu = EVENT.Menu; error.oncontextmenu = EVENT.Menu;
error.onmousedown = EVENT.Mousedown; error.onmousedown = EVENT.Mousedown;
error.onkeydown = EVENT.Keydown; error.onkeydown = EVENT.Keydown;
error.tabIndex = this.getTabOrder(); error.tabIndex = this.getTabOrder(this.getJaxFor(script));
} else { } else {
MathJax.Ajax.Require("[MathJax]/extensions/MathEvents.js",function () { MathJax.Ajax.Require("[MathJax]/extensions/MathEvents.js",function () {
var EVENT = MathJax.Extension.MathEvents.Event; var EVENT = MathJax.Extension.MathEvents.Event;
error.oncontextmenu = EVENT.Menu; error.oncontextmenu = EVENT.Menu;
error.onmousedown = EVENT.Mousedown; error.onmousedown = EVENT.Mousedown;
error.keydown = EVENT.Keydown; error.keydown = EVENT.Keydown;
error.tabIndex = this.getTabOrder(); error.tabIndex = this.getTabOrder(this.getJaxFor(script));
}); });
} }
// //
@ -2463,7 +2463,7 @@ MathJax.Hub = {
return dst; return dst;
}, },
getTabOrder: function() { getTabOrder: function(script) {
return this.config.menuSettings.inTabOrder ? 0 : -1; return this.config.menuSettings.inTabOrder ? 0 : -1;
}, },

View File

@ -587,7 +587,7 @@
jax.tabIndex = jax.oldTabIndex jax.tabIndex = jax.oldTabIndex
delete jax.oldTabIndex; delete jax.oldTabIndex;
} else { } else {
jax.tabIndex = HUB.getTabOrder(); jax.tabIndex = HUB.getTabOrder(jax);
} }
} }
}, },

View File

@ -403,7 +403,7 @@
onmouseover:EVENT.Mouseover, onmouseout:EVENT.Mouseout, onmousemove:EVENT.Mousemove, onmouseover:EVENT.Mouseover, onmouseout:EVENT.Mouseout, onmousemove:EVENT.Mousemove,
onclick:EVENT.Click, ondblclick:EVENT.DblClick, onclick:EVENT.Click, ondblclick:EVENT.DblClick,
// Added for keyboard accessible menu. // Added for keyboard accessible menu.
onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder() onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder(jax)
}); });
if (jax.CHTML.display) { if (jax.CHTML.display) {
// //

View File

@ -578,7 +578,7 @@
onmousemove:EVENT.Mousemove, onclick:EVENT.Click, onmousemove:EVENT.Mousemove, onclick:EVENT.Click,
ondblclick:EVENT.DblClick, ondblclick:EVENT.DblClick,
// Added for keyboard accessible menu. // Added for keyboard accessible menu.
onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder() onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder(jax)
}); });
if (HUB.Browser.noContextMenu) { if (HUB.Browser.noContextMenu) {
span.ontouchstart = TOUCH.start; span.ontouchstart = TOUCH.start;

View File

@ -328,7 +328,7 @@
container.ondblclick = EVENT.DblClick; container.ondblclick = EVENT.DblClick;
// Added for keyboard accessible menu. // Added for keyboard accessible menu.
container.onkeydown = EVENT.Keydown; container.onkeydown = EVENT.Keydown;
container.tabIndex = HUB.getTabOrder(); container.tabIndex = HUB.getTabOrder(jax);
if (HUB.Browser.noContextMenu) { if (HUB.Browser.noContextMenu) {
container.ontouchstart = TOUCH.start; container.ontouchstart = TOUCH.start;
container.ontouchend = TOUCH.end; container.ontouchend = TOUCH.end;

View File

@ -91,7 +91,7 @@
ondblclick: EVENT.DblClick, ondblclick: EVENT.DblClick,
// Added for keyboard accessible menu. // Added for keyboard accessible menu.
onkeydown: EVENT.Keydown, onkeydown: EVENT.Keydown,
tabIndex: HUB.getTabOrder() tabIndex: HUB.getTabOrder(jax)
},[["span"]]); },[["span"]]);
if (HUB.Browser.noContextMenu) { if (HUB.Browser.noContextMenu) {
span.ontouchstart = TOUCH.start; span.ontouchstart = TOUCH.start;

View File

@ -199,7 +199,7 @@
onmouseover:EVENT.Mouseover, onmouseout:EVENT.Mouseout, onmousemove:EVENT.Mousemove, onmouseover:EVENT.Mouseover, onmouseout:EVENT.Mouseout, onmousemove:EVENT.Mousemove,
onclick:EVENT.Click, ondblclick:EVENT.DblClick, onclick:EVENT.Click, ondblclick:EVENT.DblClick,
// Added for keyboard accessible menu. // Added for keyboard accessible menu.
onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder() onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder(jax)
}); });
if (HUB.Browser.noContextMenu) { if (HUB.Browser.noContextMenu) {
span.ontouchstart = TOUCH.start; span.ontouchstart = TOUCH.start;

View File

@ -222,7 +222,7 @@
onmouseover:EVENT.Mouseover, onmouseout:EVENT.Mouseout, onmousemove:EVENT.Mousemove, onmouseover:EVENT.Mouseover, onmouseout:EVENT.Mouseout, onmousemove:EVENT.Mousemove,
onclick:EVENT.Click, ondblclick:EVENT.DblClick, onclick:EVENT.Click, ondblclick:EVENT.DblClick,
// Added for keyboard accessible menu. // Added for keyboard accessible menu.
onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder() onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder(jax)
}); });
if (HUB.Browser.noContextMenu) { if (HUB.Browser.noContextMenu) {
span.ontouchstart = TOUCH.start; span.ontouchstart = TOUCH.start;