From 5ad9dbf519d131e69f3b9c5a3fdf73d0e96011e0 Mon Sep 17 00:00:00 2001 From: Jonni Madekivi Date: Mon, 17 Dec 2018 09:43:37 +0200 Subject: Prevent IndexOutOfBoundException in VMenuBar.CustomMenuItem (#11285) * Fixes #10814 * Add missing tests Fixes #11374 --- client/src/main/java/com/vaadin/client/ui/VMenuBar.java | 1 + 1 file changed, 1 insertion(+) (limited to 'client/src/main/java') diff --git a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java index a652cf79fd..2d4f35a2ad 100644 --- a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java +++ b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java @@ -903,6 +903,7 @@ public class VMenuBar extends FocusableFlowPanel implements super.onLoad(); if (getParentMenu() != null && getParentMenu().getParentMenu() == null + && getParentMenu().getItems().size() >= 1 && getParentMenu().getItems().get(0).equals(this)) { getElement().setAttribute("tabindex", "0"); } else { -- cgit v1.2.3