From 5cac0382b74f8f35a5bae0c38d89ca1b719db537 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 16 Sep 2015 10:12:49 +0930 Subject: [PATCH] Don't use a default dropdown label --- framework/core/js/forum/src/components/UserCard.js | 1 + framework/core/js/lib/components/Dropdown.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/core/js/forum/src/components/UserCard.js b/framework/core/js/forum/src/components/UserCard.js index 4c44bfc42..9fdf41177 100644 --- a/framework/core/js/forum/src/components/UserCard.js +++ b/framework/core/js/forum/src/components/UserCard.js @@ -40,6 +40,7 @@ export default class UserCard extends Component { className: 'UserCard-controls App-primaryControl', menuClassName: 'Dropdown-menu--right', buttonClassName: this.props.controlsButtonClassName, + label: app.trans('core.controls'), icon: 'ellipsis-v' }) : ''} diff --git a/framework/core/js/lib/components/Dropdown.js b/framework/core/js/lib/components/Dropdown.js index 16e3cc3ec..2320190a3 100644 --- a/framework/core/js/lib/components/Dropdown.js +++ b/framework/core/js/lib/components/Dropdown.js @@ -24,7 +24,7 @@ export default class Dropdown extends Component { props.className = props.className || ''; props.buttonClassName = props.buttonClassName || ''; props.menuClassName = props.menuClassName || ''; - props.label = props.label || app.trans('core.controls'); + props.label = props.label || ''; props.caretIcon = typeof props.caretIcon !== 'undefined' ? props.caretIcon : 'caret-down'; }