diff options
| author | ThibG <thib@sitedethib.com> | 2020-11-20 15:11:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 15:11:43 +0100 |
| commit | 24696458bf22c8529b49f89b2791e3e07583b7e0 (patch) | |
| tree | 65e4711917b343a38c6e9f498f8d36e71dcde7c4 /app/javascript/mastodon/containers/status_container.js | |
| parent | db01f8b942b72eaa2eacbb144261b002f8079c9c (diff) | |
| parent | 3281c9b4c0935a9296e0ea5f359243d732605832 (diff) | |
Merge pull request #1467 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/mastodon/containers/status_container.js')
| -rw-r--r-- | app/javascript/mastodon/containers/status_container.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js index 7bfd66d3e..fe81981a7 100644 --- a/app/javascript/mastodon/containers/status_container.js +++ b/app/javascript/mastodon/containers/status_container.js @@ -57,7 +57,11 @@ const makeMapStateToProps = () => { const mapStateToProps = (state, props) => ({ status: getStatus(state, props), - usingPiP: state.get('picture_in_picture').statusId === props.id, + + pictureInPicture: { + inUse: state.getIn(['meta', 'layout']) !== 'mobile' && state.get('picture_in_picture').statusId === props.id, + available: state.getIn(['meta', 'layout']) !== 'mobile', + }, }); return mapStateToProps; |