Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix #6157: boosting own private toots (#7200)

Browse source 
* Fix boosting own private toots.

* Run yarn manage:translations and update Japanese translations.
This commit is contained in:
mayaeh 2018-04-20 21:58:33 +09:00 • committed by Eugen Rochko
parent 4e35ce8269
commit ee2e0f694a
5 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,7 +63,7 @@ class DropdownMenu extends React.PureComponent {
if (typeof action === 'function') {
e.preventDefault();
action();
action(e);
} else if (to) {
e.preventDefault();
this.context.router.history.push(to);

4
app/javascript/mastodon/components/status_action_bar.js
View file

@ -153,7 +153,9 @@ export default class StatusActionBar extends ImmutablePureComponent {
if (publicStatus) {
menu.push({ text: intl.formatMessage(status.get('pinned') ? messages.unpin : messages.pin), action: this.handlePinClick });
} else {
menu.push({ text: intl.formatMessage(status.get('reblog') ? messages.reblog_private : messages.cancel_reblog_private), action: this.handleReblogClick });
if (status.get('visibility') === 'private') {
menu.push({ text: intl.formatMessage(status.get('reblogged') ? messages.cancel_reblog_private : messages.reblog_private), action: this.handleReblogClick });
}
}
menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick });