diff options
author | cwm <chriswmartin@protonmail.com> | 2017-12-28 08:30:51 -0600 |
---|---|---|
committer | cwm <chriswmartin@protonmail.com> | 2017-12-28 08:30:51 -0600 |
commit | 832a93e67c94ad479c8c8cff2372350b65fb77fc (patch) | |
tree | e0b8838239f9813d7d6607b62a65f7563e6e28a3 /app/javascript/flavours/glitch/components/avatar_overlay.js | |
parent | 7347bc733418651216f22f224caf656471499a08 (diff) |
Fix GIF avatars not autoplaying (fixes #287, tootsuite pr #6000)
Diffstat (limited to 'app/javascript/flavours/glitch/components/avatar_overlay.js')
-rw-r--r-- | app/javascript/flavours/glitch/components/avatar_overlay.js | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/components/avatar_overlay.js b/app/javascript/flavours/glitch/components/avatar_overlay.js index 2ecf9fa44..23db5182b 100644 --- a/app/javascript/flavours/glitch/components/avatar_overlay.js +++ b/app/javascript/flavours/glitch/components/avatar_overlay.js @@ -1,22 +1,29 @@ import React from 'react'; +import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; +import { autoPlayGif } from 'flavours/glitch/util/initial_state'; export default class AvatarOverlay extends React.PureComponent { static propTypes = { account: ImmutablePropTypes.map.isRequired, friend: ImmutablePropTypes.map.isRequired, + animate: PropTypes.bool, + }; + + static defaultProps = { + animate: autoPlayGif, }; render() { - const { account, friend } = this.props; + const { account, friend, animate } = this.props; const baseStyle = { - backgroundImage: `url(${account.get('avatar_static')})`, + backgroundImage: `url(${account.get(animate ? 'avatar' : 'avatar_static')})`, }; const overlayStyle = { - backgroundImage: `url(${friend.get('avatar_static')})`, + backgroundImage: `url(${friend.get(animate ? 'avatar' : 'avatar_static')})`, }; return ( |