Ver código fonte

Added logout to dropdown menu (#11353)

* Added logout to dropdown menu

* Triggering build-and-test with empty commit as it seems it failed due to some internal failure

* Looks fine, ready to review

* Added changes from review

* method can be null without any problems

* Also target can be null
master^2
koyu 4 anos atrás
committed by Eugen Rochko
pai
commit
8df0022e66
2 arquivos alterados com 5 adições e 2 exclusões
  1. +2
    -2
      app/javascript/mastodon/components/dropdown_menu.js
  2. +3
    -0
      app/javascript/mastodon/features/compose/components/action_bar.js

+ 2
- 2
app/javascript/mastodon/components/dropdown_menu.js Ver arquivo

@@ -122,11 +122,11 @@ class DropdownMenu extends React.PureComponent {
return <li key={`sep-${i}`} className='dropdown-menu__separator' />;
}

const { text, href = '#' } = option;
const { text, href = '#', target = '_blank', method } = option;

return (
<li className='dropdown-menu__item' key={`${text}-${i}`}>
<a href={href} target='_blank' rel='noopener' role='button' tabIndex='0' ref={i === 0 ? this.setFocusRef : null} onClick={this.handleClick} onKeyDown={this.handleItemKeyDown} data-index={i}>
<a href={href} target={target} data-method={method} rel='noopener' role='button' tabIndex='0' ref={i === 0 ? this.setFocusRef : null} onClick={this.handleClick} onKeyDown={this.handleItemKeyDown} data-index={i}>
{text}
</a>
</li>


+ 3
- 0
app/javascript/mastodon/features/compose/components/action_bar.js Ver arquivo

@@ -15,6 +15,7 @@ const messages = defineMessages({
domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' },
logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
});

export default @injectIntl
@@ -42,6 +43,8 @@ class ActionBar extends React.PureComponent {
menu.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' });
menu.push({ text: intl.formatMessage(messages.filters), href: '/filters' });
menu.push(null);
menu.push({ text: intl.formatMessage(messages.logout), href: '/auth/sign_out', target: null, method: 'delete' });

return (
<div className='compose__action-bar'>


Carregando…
Cancelar
Salvar