Browse Source

MenuBar: Don't set openRootOnHover when on Android or IOS. (#12135)

Fixes #5873
tags/7.7.23
Martin Vysny 3 years ago
parent
commit
1c734ae92d
No account linked to committer's email address

+ 9
- 2
client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java View File

import com.google.gwt.user.client.Command; import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Timer;
import com.vaadin.client.ApplicationConnection; import com.vaadin.client.ApplicationConnection;
import com.vaadin.client.BrowserInfo;
import com.vaadin.client.Paintable; import com.vaadin.client.Paintable;
import com.vaadin.client.TooltipInfo; import com.vaadin.client.TooltipInfo;
import com.vaadin.client.UIDL; import com.vaadin.client.UIDL;
widget.htmlContentAllowed = uidl widget.htmlContentAllowed = uidl
.hasAttribute(MenuBarConstants.HTML_CONTENT_ALLOWED); .hasAttribute(MenuBarConstants.HTML_CONTENT_ALLOWED);


widget.openRootOnHover = uidl
.getBooleanAttribute(MenuBarConstants.OPEN_ROOT_MENU_ON_HOWER);
if (BrowserInfo.get().isAndroid() || BrowserInfo.get().isIOS()) {
// disable the auto-open on hover on devices that don't support hover.
// fixes https://github.com/vaadin/framework/issues/5873
widget.openRootOnHover = false;
} else {
widget.openRootOnHover = uidl
.getBooleanAttribute(MenuBarConstants.OPEN_ROOT_MENU_ON_HOWER);
}


widget.enabled = isEnabled(); widget.enabled = isEnabled();



Loading…
Cancel
Save