autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix media modal crashing when media has no blurhash (#15229)

Browse Source
This commit is contained in:
Eugen Rochko 2020-11-28 03:37:01 +01:00 committed by GitHub
parent e7f1439b97
commit 13206fcfb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/mastodon/features/ui/components/media_modal.js
View File

@ -221,10 +221,13 @@ class MediaModal extends ImmutablePureComponent {
_sendBackgroundColor () { _sendBackgroundColor () {
const { media, onChangeBackgroundColor } = this.props; const { media, onChangeBackgroundColor } = this.props;
const index = this.getIndex(); const index = this.getIndex();
const backgroundColor = decodeRGB(decode83(media.getIn([index, 'blurhash']).slice(2, 6))); const blurhash = media.getIn([index, 'blurhash']);
if (blurhash) {
const backgroundColor = decodeRGB(decode83(blurhash.slice(2, 6)));
onChangeBackgroundColor(backgroundColor); onChangeBackgroundColor(backgroundColor);
} }
}
componentWillUnmount () { componentWillUnmount () {
window.removeEventListener('keydown', this.handleKeyDown); window.removeEventListener('keydown', this.handleKeyDown);