From 516874b50c9e86b7534f655cf4b356b72c0e6fac Mon Sep 17 00:00:00 2001
From: zorkow <volker.sorge@gmail.com>
Date: Tue, 1 Sep 2015 18:52:45 +0100
Subject: [PATCH] Corrects keys and focusing on popup boxes.

---
 unpacked/extensions/HelpDialog.js | 11 +++++++++--
 unpacked/extensions/MathMenu.js   |  5 +++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/unpacked/extensions/HelpDialog.js b/unpacked/extensions/HelpDialog.js
index 3a195d90c..07a04f0a3 100644
--- a/unpacked/extensions/HelpDialog.js
+++ b/unpacked/extensions/HelpDialog.js
@@ -29,7 +29,13 @@
 
   var STIXURL = "http://www.stixfonts.org/";
   var MENU = MathJax.Menu;
+  var FALSE, KEY;
+  HUB.Register.StartupHook("MathEvents Ready",function () {
+    FALSE = MathJax.Extension.MathEvents.Event.False;
+    KEY = MathJax.Extension.MathEvents.Event.KEY;
+  });
 
+  
   var CONFIG = HUB.CombineConfig("HelpDialog",{
 
     styles: {
@@ -104,7 +110,7 @@
       id: "MathJax_Help", tabIndex: 0, onkeydown: HELP.Keydown
     },LOCALE._("HelpDialog",[
       ["b",{style:{fontSize:"120%"}},[["Help","MathJax Help"]]],
-      ["div",{id: "MathJax_HelpContent"},[
+      ["div",{id: "MathJax_HelpContent", tabIndex: 0},[
         ["p",{},[["MathJax",
           "*MathJax* is a JavaScript library that allows page authors to include " +
           "mathematics within their web pages.  As a reader, you don't need to do " +
@@ -173,8 +179,9 @@
   HELP.Keydown = function(event) {
     if (event.keyCode === KEY.ESCAPE ||
         (this.id === 'MathJax_HelpClose' &&
-         (event.keyCode === KEY.SPACE || event.keyCode === KEY.Return))) {
+         (event.keyCode === KEY.SPACE || event.keyCode === KEY.RETURN))) {
       HELP.Remove(event);
+      FALSE(event);
     }
   },
 
diff --git a/unpacked/extensions/MathMenu.js b/unpacked/extensions/MathMenu.js
index e52a55134..5f9a832d1 100644
--- a/unpacked/extensions/MathMenu.js
+++ b/unpacked/extensions/MathMenu.js
@@ -1026,7 +1026,7 @@
         display:"inline-block", "text-align":"left", "font-size":"80%",
         "max-height":"20em", overflow:"auto",
         "background-color":"#E4E4E4", padding:".4em .6em", border:"1px inset"
-      }},jax],["br"],["br"],
+      }, tabIndex: 0},jax],["br"],["br"],
       ["a",{href:"http://www.mathjax.org/"},["www.mathjax.org"]],
       ["span",{className:"MathJax_MenuClose",id:"MathJax_AboutClose",
                onclick:MENU.About.Remove,
@@ -1053,8 +1053,9 @@
   MENU.About.Keydown = function(event) {
     if (event.keyCode === KEY.ESCAPE ||
         (this.id === 'MathJax_AboutClose' &&
-         (event.keyCode === KEY.SPACE || event.keyCode === KEY.Return))) {
+         (event.keyCode === KEY.SPACE || event.keyCode === KEY.RETURN))) {
       MENU.About.Remove(event);
+      FALSE(event);
     }
   },
   MENU.About.GetJax = function (jax,JAX,type,noTypeCheck) {