diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-11-24 12:27:15 -0600 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-11-24 12:27:15 -0600 |
| commit | 69fa4f7d4f3c435018c1e7cb9e6a0fcb5b233695 (patch) | |
| tree | ffbd8bc1e5c820fce33624874088863c43460299 /app/javascript/mastodon/containers/status_container.js | |
| parent | 90b33ab8af91991217cdce3e2d9163756e58a691 (diff) | |
| parent | 24696458bf22c8529b49f89b2791e3e07583b7e0 (diff) | |
Merge remote-tracking branch 'upstream/master' into merge-glitch
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; |