github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-22 02:14:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use a default dropdown label

Browse Source
This commit is contained in:
Toby Zerner 2015-09-16 10:12:49 +09:30
parent 64207a53c6
commit 8414a59908
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/forum/src/components/UserCard.js
View File

@ -40,6 +40,7 @@ export default class UserCard extends Component {
className: 'UserCard-controls App-primaryControl', className: 'UserCard-controls App-primaryControl',
menuClassName: 'Dropdown-menu--right', menuClassName: 'Dropdown-menu--right',
buttonClassName: this.props.controlsButtonClassName, buttonClassName: this.props.controlsButtonClassName,
label: app.trans('core.controls'),
icon: 'ellipsis-v' icon: 'ellipsis-v'
}) : ''} }) : ''}

2
js/lib/components/Dropdown.js
View File

@ -24,7 +24,7 @@ export default class Dropdown extends Component {
props.className = props.className || ''; props.className = props.className || '';
props.buttonClassName = props.buttonClassName || ''; props.buttonClassName = props.buttonClassName || '';
props.menuClassName = props.menuClassName || ''; 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'; props.caretIcon = typeof props.caretIcon !== 'undefined' ? props.caretIcon : 'caret-down';
} }