queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix "Edit profile" on the account action bar (#3222)

Browse source
This commit is contained in:
unarist 2017-05-22 21:57:50 +09:00 committed by Eugen Rochko
parent aa662cecad
commit 07af8c05fd
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/javascript/mastodon/components/dropdown_menu.js
View file

@ -33,11 +33,14 @@ class DropdownMenu extends React.PureComponent {
const i = Number(e.currentTarget.getAttribute('data-index')); const i = Number(e.currentTarget.getAttribute('data-index'));
const { action, to } = this.props.items[i]; const { action, to } = this.props.items[i];
e.preventDefault(); // Don't call e.preventDefault() when the item uses 'href' property.
// ex. "Edit profile" on the account action bar
if (typeof action === 'function') { if (typeof action === 'function') {
e.preventDefault();
action(); action();
} else if (to) { } else if (to) {
e.preventDefault();
this.context.router.push(to); this.context.router.push(to);
} }