Navigation Menubar Example: Fix escape key behavior when in menubar o…

…r in second level submenu (pull #740) For issues #451 and #795, change escape key processing. When focus in menubar, close any open submenu. When focus in second level submenu, close second level menu and focus parent menuitem.
w3c · Jun 27, 2018 · 15b87d9 · 15b87d9
1 parent dc1ed44
commit 15b87d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/examples/menubar/menubar-1/js/MenubarItemLinks.js b/examples/menubar/menubar-1/js/MenubarItemLinks.js
@@ -104,6 +104,9 @@ MenubarItem.prototype.handleKeydown = function (event) {
       this.popupMenu.close(true);
       break;
 
+    case this.keyCode.ESC:
+      this.popupMenu.close(true);
+      break;
 
     default:
       if (isPrintableCharacter(char)) {

diff --git a/examples/menubar/menubar-1/js/PopupMenuItemLinks.js b/examples/menubar/menubar-1/js/PopupMenuItemLinks.js
@@ -114,7 +114,6 @@ MenuItem.prototype.handleKeydown = function (event) {
       break;
 
     case this.keyCode.RIGHT:
-      console.log('[MenuItem][handleKeydown]: ' + this.menu.controller.isMenubarItem);
       if (this.popupMenu) {
         this.popupMenu.open();
         this.popupMenu.setFocusToFirstItem();

diff --git a/examples/menubar/menubar-1/js/PopupMenuLinks.js b/examples/menubar/menubar-1/js/PopupMenuLinks.js
@@ -117,7 +117,9 @@ PopupMenu.prototype.setFocusToController = function (command, flag) {
   }
 
   if (command === '') {
-    setFocusToMenubarItem(this.controller, true);
+    if (this.controller && this.controller.domNode) {
+      this.controller.domNode.focus();
+    }
     return;
   }
 
@@ -213,8 +215,6 @@ PopupMenu.prototype.open = function () {
   // Get position and bounding rectangle of controller object's DOM node
   var rect = this.controller.domNode.getBoundingClientRect();
 
-  console.log('[PopupMenu][open]');
-
   // Set CSS properties
   if (!this.controller.isMenubarItem) {
     this.domNode.parentNode.style.position = 'relative';
@@ -236,8 +236,6 @@ PopupMenu.prototype.open = function () {
 
 PopupMenu.prototype.close = function (force) {
 
-  console.log('[PopupMenu][close][force]: ' + force);
-
   var controllerHasHover = this.controller.hasHover;
 
   var hasFocus = this.hasFocus;
@@ -249,8 +247,6 @@ PopupMenu.prototype.close = function (force) {
     }
   }
 
-  console.log('[PopupMenu][close][hasFocus]: ' + hasFocus);
-
   if (!this.controller.isMenubarItem) {
     controllerHasHover = false;
   }