treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Rename DropdownMenu's ariaLabel to title, to reduce unnecessary changes with upstream

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Thibaut Girka 2020-01-25 10:17:13 +01:00
parent 05351cbffb
commit 1f8563c256
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/flavours/glitch/components/dropdown_menu.js
View File

@ -184,7 +184,7 @@ export default class Dropdown extends React.PureComponent {
icon: PropTypes.string.isRequired, icon: PropTypes.string.isRequired,
items: PropTypes.array.isRequired, items: PropTypes.array.isRequired,
size: PropTypes.number.isRequired, size: PropTypes.number.isRequired,
ariaLabel: PropTypes.string, title: PropTypes.string,
disabled: PropTypes.bool, disabled: PropTypes.bool,
status: ImmutablePropTypes.map, status: ImmutablePropTypes.map,
isUserTouching: PropTypes.func, isUserTouching: PropTypes.func,
@ -197,7 +197,7 @@ export default class Dropdown extends React.PureComponent {
}; };
static defaultProps = { static defaultProps = {
ariaLabel: 'Menu', title: 'Menu',
}; };
state = { state = {
@ -277,14 +277,14 @@ export default class Dropdown extends React.PureComponent {
} }
render () { render () {
const { icon, items, size, ariaLabel, disabled, dropdownPlacement, openDropdownId, openedViaKeyboard } = this.props; const { icon, items, size, title, disabled, dropdownPlacement, openDropdownId, openedViaKeyboard } = this.props;
const open = this.state.id === openDropdownId; const open = this.state.id === openDropdownId;
return ( return (
<div> <div>
<IconButton <IconButton
icon={icon} icon={icon}
title={ariaLabel} title={title}
active={open} active={open}
disabled={disabled} disabled={disabled}
size={size} size={size}

2
app/javascript/flavours/glitch/features/status/components/action_bar.js
View File

@ -207,7 +207,7 @@ class ActionBar extends React.PureComponent {
<div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div> <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
<div className='detailed-status__action-bar-dropdown'> <div className='detailed-status__action-bar-dropdown'>
<DropdownMenuContainer size={18} icon='ellipsis-h' items={menu} direction='left' ariaLabel='More' /> <DropdownMenuContainer size={18} icon='ellipsis-h' items={menu} direction='left' title='More' />
</div> </div>
</div> </div>
); );