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

Add "edit profile" link to dropdown on own profile

lolsob-rspec
Eugen Rochko 2016-10-14 02:45:20 +02:00
parent 3531427c92
commit 6f1497586c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/components/components/dropdown_menu.jsx
View File

@ -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>

2
app/assets/javascripts/components/features/account/components/action_bar.jsx
View File

@ -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'])) {