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

Merge commit '34225d7199' into kb_migration

Browse source
This commit is contained in:
KMY 2023-03-27 14:06:56 +09:00
commit 76340285d6
168 changed files with 965 additions and 611 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
View file

@ -37,8 +37,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
export default @connect(makeMapStateToProps)
@injectIntl
class Footer extends ImmutablePureComponent {
static contextTypes = {
@ -190,3 +188,5 @@ class Footer extends ImmutablePureComponent {
}
}
export default connect(makeMapStateToProps)(injectIntl(Footer));

4
app/javascript/mastodon/features/picture_in_picture/components/header.jsx
View file

@ -17,8 +17,6 @@ const mapStateToProps = (state, { accountId }) => ({
account: state.getIn(['accounts', accountId]),
});
export default @connect(mapStateToProps)
@injectIntl
class Header extends ImmutablePureComponent {
static propTypes = {
@ -45,3 +43,5 @@ class Header extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Header));

3
app/javascript/mastodon/features/picture_in_picture/index.jsx
View file

@ -11,7 +11,6 @@ const mapStateToProps = state => ({
...state.get('picture_in_picture'),
});
export default @connect(mapStateToProps)
class PictureInPicture extends React.Component {
static propTypes = {
@ -83,3 +82,5 @@ class PictureInPicture extends React.Component {
}
}
export default connect(mapStateToProps)(PictureInPicture);