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

Merge branch 'kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-03-22 22:50:45 +09:00
commit 4990a50874
7 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -186,6 +186,8 @@ class ActionBar extends React.PureComponent {
this.props.onEmojiReact(this.props.status, data);
};
handleEmojiPickInnerButton = () => {};
render () {
const { status, relationship, intl } = this.props;
const { signedIn, permissions } = this.context.identity;
@ -268,7 +270,7 @@ class ActionBar extends React.PureComponent {
);
const emojiPickerButton = (
<IconButton icon='smile-o' />
<IconButton icon='smile-o' onClick={this.handleEmojiPickInnerButton} />
);
let replyIcon;