From 42f50049ff29ccdc484c22f8a5a19cda2dd03a5b Mon Sep 17 00:00:00 2001 From: kibigo! Date: Wed, 3 Jan 2018 12:36:21 -0800 Subject: WIP Refactor; 1000 tiny edits --- app/javascript/flavours/glitch/util/redux_helpers.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'app/javascript/flavours/glitch/util/redux_helpers.js') diff --git a/app/javascript/flavours/glitch/util/redux_helpers.js b/app/javascript/flavours/glitch/util/redux_helpers.js index c0f5eeb28..8eb338da7 100644 --- a/app/javascript/flavours/glitch/util/redux_helpers.js +++ b/app/javascript/flavours/glitch/util/redux_helpers.js @@ -1,16 +1,8 @@ import { injectIntl } from 'react-intl'; import { connect } from 'react-redux'; -// Merges react-redux props. -export function mergeProps (stateProps, dispatchProps, ownProps) { - Object.assign({}, ownProps, { - dispatch: Object.assign({}, dispatchProps, ownProps.dispatch || {}), - state: Object.assign({}, stateProps, ownProps.state || {}), - }); -} - // Connects a component. export function wrap (Component, mapStateToProps, mapDispatchToProps, options) { const withIntl = typeof options === 'object' ? options.withIntl : !!options; - return (withIntl ? injectIntl : i => i)(connect(mapStateToProps, mapDispatchToProps, mergeProps)(Component)); + return (withIntl ? injectIntl : i => i)(connect(mapStateToProps, mapDispatchToProps)(Component)); } -- cgit