From d1a569c905e73287429b4465a895f92e75efb403 Mon Sep 17 00:00:00 2001
From: "Davide P. Cervone" <dpvc@union.edu>
Date: Sat, 6 Feb 2016 10:35:31 -0500
Subject: [PATCH] Add jax parameter to getTabOrder() so that, if overridden,
 you can identify the jax (and it asociated script).

---
 unpacked/MathJax.js                    | 6 +++---
 unpacked/extensions/MathMenu.js        | 2 +-
 unpacked/jax/output/CommonHTML/jax.js  | 2 +-
 unpacked/jax/output/HTML-CSS/jax.js    | 2 +-
 unpacked/jax/output/NativeMML/jax.js   | 2 +-
 unpacked/jax/output/PlainSource/jax.js | 2 +-
 unpacked/jax/output/PreviewHTML/jax.js | 2 +-
 unpacked/jax/output/SVG/jax.js         | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/unpacked/MathJax.js b/unpacked/MathJax.js
index 39110eb28..353c00ed9 100644
--- a/unpacked/MathJax.js
+++ b/unpacked/MathJax.js
@@ -2368,14 +2368,14 @@ MathJax.Hub = {
       error.oncontextmenu = EVENT.Menu;
       error.onmousedown = EVENT.Mousedown;
       error.onkeydown = EVENT.Keydown;
-      error.tabIndex = this.getTabOrder();
+      error.tabIndex = this.getTabOrder(this.getJaxFor(script));
     } else {
       MathJax.Ajax.Require("[MathJax]/extensions/MathEvents.js",function () {
         var EVENT = MathJax.Extension.MathEvents.Event;
         error.oncontextmenu = EVENT.Menu;
         error.onmousedown = EVENT.Mousedown;
         error.keydown = EVENT.Keydown;
-        error.tabIndex = this.getTabOrder();
+        error.tabIndex = this.getTabOrder(this.getJaxFor(script));
       });
     }
     //
@@ -2463,7 +2463,7 @@ MathJax.Hub = {
     return dst;
   },
 
-  getTabOrder: function() {
+  getTabOrder: function(script) {
     return this.config.menuSettings.inTabOrder ? 0 : -1;
   },
 
diff --git a/unpacked/extensions/MathMenu.js b/unpacked/extensions/MathMenu.js
index ba8ce1f39..360231487 100644
--- a/unpacked/extensions/MathMenu.js
+++ b/unpacked/extensions/MathMenu.js
@@ -587,7 +587,7 @@
           jax.tabIndex = jax.oldTabIndex
           delete jax.oldTabIndex;
         } else {
-          jax.tabIndex = HUB.getTabOrder();
+          jax.tabIndex = HUB.getTabOrder(jax);
         }
       }
     },
diff --git a/unpacked/jax/output/CommonHTML/jax.js b/unpacked/jax/output/CommonHTML/jax.js
index 354bfecf9..bed4fe2bb 100644
--- a/unpacked/jax/output/CommonHTML/jax.js
+++ b/unpacked/jax/output/CommonHTML/jax.js
@@ -403,7 +403,7 @@
           onmouseover:EVENT.Mouseover, onmouseout:EVENT.Mouseout, onmousemove:EVENT.Mousemove,
 	  onclick:EVENT.Click, ondblclick:EVENT.DblClick,
           // Added for keyboard accessible menu.
-          onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder()
+          onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder(jax)
         });
         if (jax.CHTML.display) {
           //
diff --git a/unpacked/jax/output/HTML-CSS/jax.js b/unpacked/jax/output/HTML-CSS/jax.js
index 92792601b..f00dfe6d1 100644
--- a/unpacked/jax/output/HTML-CSS/jax.js
+++ b/unpacked/jax/output/HTML-CSS/jax.js
@@ -578,7 +578,7 @@
           onmousemove:EVENT.Mousemove, onclick:EVENT.Click,
           ondblclick:EVENT.DblClick,
           // Added for keyboard accessible menu.
-          onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder()
+          onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder(jax)
         });
 	if (HUB.Browser.noContextMenu) {
 	  span.ontouchstart = TOUCH.start;
diff --git a/unpacked/jax/output/NativeMML/jax.js b/unpacked/jax/output/NativeMML/jax.js
index 028fc19ef..c7c436587 100644
--- a/unpacked/jax/output/NativeMML/jax.js
+++ b/unpacked/jax/output/NativeMML/jax.js
@@ -328,7 +328,7 @@
         container.ondblclick    = EVENT.DblClick;
         // Added for keyboard accessible menu.
         container.onkeydown = EVENT.Keydown;
-        container.tabIndex = HUB.getTabOrder();
+        container.tabIndex = HUB.getTabOrder(jax);
 	if (HUB.Browser.noContextMenu) {
 	  container.ontouchstart = TOUCH.start;
 	  container.ontouchend   = TOUCH.end;
diff --git a/unpacked/jax/output/PlainSource/jax.js b/unpacked/jax/output/PlainSource/jax.js
index b217246e0..a34ca39d4 100644
--- a/unpacked/jax/output/PlainSource/jax.js
+++ b/unpacked/jax/output/PlainSource/jax.js
@@ -91,7 +91,7 @@
           ondblclick: EVENT.DblClick,
           // Added for keyboard accessible menu.
           onkeydown: EVENT.Keydown,
-          tabIndex: HUB.getTabOrder()
+          tabIndex: HUB.getTabOrder(jax)
         },[["span"]]);
         if (HUB.Browser.noContextMenu) {
           span.ontouchstart = TOUCH.start;
diff --git a/unpacked/jax/output/PreviewHTML/jax.js b/unpacked/jax/output/PreviewHTML/jax.js
index 5e9f91dbf..1ff2c6c2e 100644
--- a/unpacked/jax/output/PreviewHTML/jax.js
+++ b/unpacked/jax/output/PreviewHTML/jax.js
@@ -199,7 +199,7 @@
           onmouseover:EVENT.Mouseover, onmouseout:EVENT.Mouseout, onmousemove:EVENT.Mousemove,
 	  onclick:EVENT.Click, ondblclick:EVENT.DblClick,
           // Added for keyboard accessible menu.
-          onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder()
+          onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder(jax)
         });
 	if (HUB.Browser.noContextMenu) {
 	  span.ontouchstart = TOUCH.start;
diff --git a/unpacked/jax/output/SVG/jax.js b/unpacked/jax/output/SVG/jax.js
index aa8ff7893..ea221f1d7 100644
--- a/unpacked/jax/output/SVG/jax.js
+++ b/unpacked/jax/output/SVG/jax.js
@@ -222,7 +222,7 @@
           onmouseover:EVENT.Mouseover, onmouseout:EVENT.Mouseout, onmousemove:EVENT.Mousemove,
 	  onclick:EVENT.Click, ondblclick:EVENT.DblClick,
           // Added for keyboard accessible menu.
-          onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder()
+          onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder(jax)
         });
 	if (HUB.Browser.noContextMenu) {
 	  span.ontouchstart = TOUCH.start;