hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix new audio player when under content warnings

signup-info-prompt
Thibaut Girka 2020-08-11 21:01:37 +02:00 committed by ThibG
parent 59c44ce323
commit 0376b6b92b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/flavours/glitch/features/audio/index.js
View File

@ -68,12 +68,14 @@ class Audio extends React.PureComponent {
const width = this.player.offsetWidth; const width = this.player.offsetWidth;
const height = this.props.fullscreen ? this.player.offsetHeight : (width / (16/9)); const height = this.props.fullscreen ? this.player.offsetHeight : (width / (16/9));
if (width && width != this.state.containerWidth) {
if (this.props.cacheWidth) { if (this.props.cacheWidth) {
this.props.cacheWidth(width); this.props.cacheWidth(width);
} }
this.setState({ width, height }); this.setState({ width, height });
} }
}
setSeekRef = c => { setSeekRef = c => {
this.seek = c; this.seek = c;
@ -102,6 +104,10 @@ class Audio extends React.PureComponent {
} }
componentDidUpdate (prevProps, prevState) { componentDidUpdate (prevProps, prevState) {
if (this.player) {
this._setDimensions();
}
if (prevProps.src !== this.props.src || this.state.width !== prevState.width || this.state.height !== prevState.height || prevProps.accentColor !== this.props.accentColor) { if (prevProps.src !== this.props.src || this.state.width !== prevState.width || this.state.height !== prevState.height || prevProps.accentColor !== this.props.accentColor) {
this._clear(); this._clear();
this._draw(); this._draw();