diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/components/components/dropdown_menu.jsx | 7 | ||||
-rw-r--r-- | app/assets/javascripts/components/features/account/components/action_bar.jsx | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/components/dropdown_menu.jsx b/app/assets/javascripts/components/components/dropdown_menu.jsx index 619605f63..f58a36d29 100644 --- a/app/assets/javascripts/components/components/dropdown_menu.jsx +++ b/app/assets/javascripts/components/components/dropdown_menu.jsx @@ -9,7 +9,12 @@ const DropdownMenu = ({ icon, items, size }) => { <DropdownContent style={{ lineHeight: '18px' }}> <ul> - {items.map(({ text, action }, i) => <li key={i}><a href='#' onClick={e => { e.preventDefault(); action(); }}>{text}</a></li>)} + {items.map(({ text, action, href = '#' }, i) => <li key={i}><a href={href} target='_blank' rel='noopener' onClick={e => { + if (typeof action === 'function') { + e.preventDefault(); + action(); + } + }}>{text}</a></li>)} </ul> </DropdownContent> </Dropdown> diff --git a/app/assets/javascripts/components/features/account/components/action_bar.jsx b/app/assets/javascripts/components/features/account/components/action_bar.jsx index 61c89313a..0f26b1e5a 100644 --- a/app/assets/javascripts/components/features/account/components/action_bar.jsx +++ b/app/assets/javascripts/components/features/account/components/action_bar.jsx @@ -19,7 +19,7 @@ const ActionBar = React.createClass({ let menu = []; if (account.get('id') === me) { - + menu.push({ text: 'Edit profile', href: '/settings/profile' }); } else if (account.getIn(['relationship', 'blocking'])) { menu.push({ text: 'Unblock', action: this.props.onBlock }); } else if (account.getIn(['relationship', 'following'])) { |