summaryrefslogtreecommitdiffstats
path: root/web/react/components/toggle_modal_button.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2015-11-20 09:22:16 -0500
committerHarrison Healey <harrisonmhealey@gmail.com>2015-11-20 09:22:16 -0500
commit25bc02c785167370b0e2e04ee04f305a801078c4 (patch)
tree00a8e7c9821fc8d8669fd7a908b3f70e3089c95a /web/react/components/toggle_modal_button.jsx
parent3aea449b524f7bbc9bae92309fb702e04c1bf01e (diff)
parent34097faa13dab6ea5d7ac992842126c17ad4d2b9 (diff)
downloadchat-25bc02c785167370b0e2e04ee04f305a801078c4.tar.gz
chat-25bc02c785167370b0e2e04ee04f305a801078c4.tar.bz2
chat-25bc02c785167370b0e2e04ee04f305a801078c4.zip
Merge pull request #1478 from mattermost/plt-1237
PLT-1237 Upgrading dependancies
Diffstat (limited to 'web/react/components/toggle_modal_button.jsx')
-rw-r--r--web/react/components/toggle_modal_button.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/toggle_modal_button.jsx b/web/react/components/toggle_modal_button.jsx
index 51c8d1f20..eae4a024d 100644
--- a/web/react/components/toggle_modal_button.jsx
+++ b/web/react/components/toggle_modal_button.jsx
@@ -22,7 +22,7 @@ export default class ModalToggleButton extends React.Component {
}
render() {
- const {children, dialogType, dialogProps, ...props} = this.props;
+ const {children, dialogType, dialogProps, ...props} = this.props; //eslint-disable-line no-redeclare
// this assumes that all modals will have a show property and an onHide event
const dialog = React.createElement(this.props.dialogType, Object.assign({}, dialogProps, {