From fc3bcf54bed9b6bf1ad132dff4d2f861669e9bca Mon Sep 17 00:00:00 2001 From: mgabdev <> Date: Mon, 15 Jun 2020 23:33:10 -0400 Subject: [PATCH] Fixed issue where if autoplayGif was off, UserInfoPopover wouldn't show MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Fixed: - issue where if autoplayGif was off, UserInfoPopover wouldn't show on Avatars --- app/javascript/gabsocial/components/avatar.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/javascript/gabsocial/components/avatar.js b/app/javascript/gabsocial/components/avatar.js index 9c7cbc89..e92c6e09 100644 --- a/app/javascript/gabsocial/components/avatar.js +++ b/app/javascript/gabsocial/components/avatar.js @@ -111,7 +111,6 @@ class Avatar extends ImmutablePureComponent { const { account, size } = this.props const { hovering, sameImg } = this.state - const shouldAnimate = autoPlayGif || !sameImg const isPro = !!account ? account.get('is_pro') : false const alt = !account ? '' : `${account.get('display_name')} ${isPro ? '(PRO)' : ''}`.trim() const classes = [_s.default, _s.circle, _s.overflowHidden] @@ -120,9 +119,9 @@ class Avatar extends ImmutablePureComponent { } const options = { - onMouseEnter: shouldAnimate ? this.handleMouseEnter : undefined, - onMouseLeave: shouldAnimate ? this.handleMouseLeave : undefined, - src: !account ? undefined : account.get((hovering || autoPlayGif) ? 'avatar' : 'avatar_static'), + onMouseEnter: this.handleMouseEnter, + onMouseLeave: this.handleMouseLeave, + src: !account ? undefined : account.get(((hovering || autoPlayGif) && !sameImg) ? 'avatar' : 'avatar_static'), alt: !account ? undefined : account.get('display_name'), style: { width: `${size}px`,