diff options
author | ThibG <thib@sitedethib.com> | 2019-05-11 12:35:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-11 12:35:25 +0200 |
commit | fe00f7a7e4469d18b43be2159fa9d953d2050f46 (patch) | |
tree | f2af743c222ad8d9dc81299195d01a3fe6b54e02 /app/javascript/flavours/glitch/containers/status_container.js | |
parent | d4d4e84324701243ce05930f45b2dc876e38c7d0 (diff) | |
parent | 14d855c42985503b525f1a77d00fada3bd15b96f (diff) |
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/containers/status_container.js')
-rw-r--r-- | app/javascript/flavours/glitch/containers/status_container.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/javascript/flavours/glitch/containers/status_container.js b/app/javascript/flavours/glitch/containers/status_container.js index 60636feb4..98dc5bb87 100644 --- a/app/javascript/flavours/glitch/containers/status_container.js +++ b/app/javascript/flavours/glitch/containers/status_container.js @@ -88,18 +88,18 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ }, onModalReblog (status) { - dispatch(reblog(status)); + if (status.get('reblogged')) { + dispatch(unreblog(status)); + } else { + dispatch(reblog(status)); + } }, onReblog (status, e) { - if (status.get('reblogged')) { - dispatch(unreblog(status)); + if (e.shiftKey || !boostModal) { + this.onModalReblog(status); } else { - if (e.shiftKey || !boostModal) { - this.onModalReblog(status); - } else { - dispatch(openModal('BOOST', { status, onReblog: this.onModalReblog })); - } + dispatch(openModal('BOOST', { status, onReblog: this.onModalReblog })); } }, |