Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-11-04 15:42:03 +00:00
commit ae844a048f

View file

@ -26,11 +26,9 @@ class MenuOption extends React.Component {
this._onClick = this._onClick.bind(this); this._onClick = this._onClick.bind(this);
} }
getDefaultProps() { static defaultProps = {
return {
disabled: false, disabled: false,
}; };
}
_onMouseEnter() { _onMouseEnter() {
this.props.onMouseEnter(this.props.dropdownKey); this.props.onMouseEnter(this.props.dropdownKey);