www

commit 5e88e809751cc5ca9b4a733e4a16e03e240f0d47
parent 7c68c1cb1c073c4b8605ce14b53ba57391b65455
Author: zorkow <volker.sorge@gmail.com>
Date:   Thu, 20 Aug 2015 14:48:50 +0100

Merge branch 'abstract_menu_entry_class' into add_tabbing

Conflicts:
	unpacked/extensions/MathMenu.js

Diffstat:
M
unpacked/extensions/MathMenu.js
 | 
30
+++++++++++++++++-------------

1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/unpacked/extensions/MathMenu.js b/unpacked/extensions/MathMenu.js
@@ -529,12 +529,16 @@
     SetNode: function(node) {
       this.node = node;
     },
-    Attributes: function() {
-      return {onmouseup: MENU.Mouseup,
-              ondragstart: FALSE, onselectstart: FALSE, onselectend: FALSE,
-              ontouchstart: MENU.Touchstart, ontouchend: MENU.Touchend,
-              className: "MathJax_MenuItem", menuItem: this};
-    },    
+
+    Attributes: function(def) {
+      return HUB.Insert(
+        {onmouseup: MENU.Mouseup,
+         ondragstart: FALSE, onselectstart: FALSE, onselectend: FALSE,
+         ontouchstart: MENU.Touchstart, ontouchend: MENU.Touchend,
+         className: "MathJax_MenuItem", menuItem: this},
+        def);
+    },
+
     Create: function (menu) {
       if (!this.hidden) {
         var def = this.Attributes();
@@ -614,16 +618,16 @@
     role: "menuitem",  // Aria role.
     
     Attributes: function() {
-      var def = this.SUPER(arguments).Attributes.apply(this,arguments);
+      var def = this.SUPER(arguments).Attributes.call(
+        this,
+        {onmouseover: MENU.Mouseover, onmouseout: MENU.Mouseout,
+         onmousedown: MENU.Mousedown, role: this.role,
+         'aria-disabled': !!this.disabled});
       if (this.disabled) {
         def.className += " MathJax_MenuDisabled";
       }
-      var augdef = {onmouseover: MENU.Mouseover, onmouseout: MENU.Mouseout,
-                    onmousedown: MENU.Mousedown, role: this.role,
-                    onkeydown: MENU.Keydown, tabIndex: -1,
-                    'aria-disabled': !!this.disabled};
-      return MathJax.Hub.Insert(def, augdef);
-    },
+      return def;
+    }
     Keydown: function(event, menu) {
       console.log('MENUEntry');
       switch (event.keyCode) {