gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 18

Add bookmarl_category_needed setting

Browse source
This commit is contained in:
KMY 2023-08-26 18:27:17 +09:00
parent bd0e2bd796
commit 5a961cc368
13 changed files with 66 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/javascript/mastodon/components/status_action_bar.jsx
View file

@ -12,7 +12,7 @@ import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/
import DropdownMenuContainer from '../containers/dropdown_menu_container';
import EmojiPickerDropdown from '../features/compose/containers/emoji_picker_dropdown_container';
import { me } from '../initial_state';
import { bookmarkCategoryNeeded, me } from '../initial_state';
import { IconButton } from './icon_button';
@ -166,13 +166,21 @@ class StatusActionBar extends ImmutablePureComponent {
};
handleBookmarkClick = () => {
this.props.onBookmark(this.props.status);
if (bookmarkCategoryNeeded) {
this.handleBookmarkCategoryAdderClick();
} else {
this.props.onBookmark(this.props.status);
}
};
handleBookmarkCategoryAdderClick = () => {
this.props.onBookmarkCategoryAdder(this.props.status);
};
handleBookmarkClickOriginal = () => {
this.props.onBookmark(this.props.status);
};
handleDeleteClick = () => {
this.props.onDelete(this.props.status, this.context.router.history);
};
@ -305,7 +313,7 @@ class StatusActionBar extends ImmutablePureComponent {
menu.push({ text: intl.formatMessage(messages.reference), action: this.handleReference });
}
menu.push({ text: intl.formatMessage(status.get('bookmarked') ? messages.removeBookmark : messages.bookmark), action: this.handleBookmarkClick });
menu.push({ text: intl.formatMessage(status.get('bookmarked') ? messages.removeBookmark : messages.bookmark), action: this.handleBookmarkClickOriginal });
menu.push({ text: intl.formatMessage(messages.bookmarkCategory), action: this.handleBookmarkCategoryAdderClick });
if (writtenByMe && pinnableStatus) {