tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Fix position of quote dropdown menu item when “quick boosting” is enabled

Browse Source 
Port 97c8cc560675070a5c82c1f253e41229fb5d2493 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Claire 2025-10-20 15:05:40 +02:00
parent 7b44fd6d3c
commit af1b658c20
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/javascript/flavours/glitch/components/status_action_bar/index.jsx
View File

@ -245,7 +245,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);
@ -257,11 +261,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/flavours/glitch/features/status/components/action_bar.jsx
View File

@ -191,6 +191,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);
@ -202,11 +206,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) {