bgme/mastodon
1
0
Fork 0
mirror of https://github.com/yingziwu/mastodon.git synced 2026-02-04 03:25:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Fix position of quote dropdown menu item when “quick boosting” is enabled (#36528)

Browse source
This commit is contained in:
Claire 2025-10-20 15:05:40 +02:00 • committed by GitHub
parent 50dfab30c2
commit 97c8cc5606
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/javascript/mastodon/components/status_action_bar/index.jsx
View file

@ -272,7 +272,11 @@ class StatusActionBar extends ImmutablePureComponent {
if (publicStatus && 'share' in navigator) { if (publicStatus && 'share' in navigator) {
menu.push({ text: intl.formatMessage(messages.share), action: this.handleShareClick }); menu.push({ text: intl.formatMessage(messages.share), action: this.handleShareClick });
} }
if (publicStatus && !isRemote) {
menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
}
if (quickBoosting && signedIn) { if (quickBoosting && signedIn) {
const quoteItem = quoteItemState(statusQuoteState); const quoteItem = quoteItemState(statusQuoteState);
menu.push(null); menu.push(null);
@ -284,11 +288,6 @@ class StatusActionBar extends ImmutablePureComponent {
disabled: quoteItem.disabled, disabled: quoteItem.disabled,
action: this.handleQuoteClick, action: this.handleQuoteClick,
}); });
menu.push(null);
}
if (publicStatus && !isRemote) {
menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
} }
if (signedIn) { if (signedIn) {

9
app/javascript/mastodon/features/status/components/action_bar.jsx
View file

@ -229,6 +229,10 @@ class ActionBar extends PureComponent {
menu.push({ text: intl.formatMessage(messages.share), action: this.handleShare }); menu.push({ text: intl.formatMessage(messages.share), action: this.handleShare });
} }
if (publicStatus && (signedIn || !isRemote)) {
menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
}
if (quickBoosting && signedIn) { if (quickBoosting && signedIn) {
const quoteItem = quoteItemState(statusQuoteState); const quoteItem = quoteItemState(statusQuoteState);
menu.push(null); menu.push(null);
@ -240,11 +244,6 @@ class ActionBar extends PureComponent {
disabled: quoteItem.disabled, disabled: quoteItem.disabled,
action: this.handleQuoteClick, action: this.handleQuoteClick,
}); });
menu.push(null);
}
if (publicStatus && (signedIn || !isRemote)) {
menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
} }
if (signedIn) { if (signedIn) {