summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-19 21:47:05 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-19 21:53:57 -0500
commit34097faa13dab6ea5d7ac992842126c17ad4d2b9 (patch)
tree4f15b43308b518a35077a563e4ac56791ff79c2d
parent55b831e4e1d3db3ffcf1d40247018783ca76af8d (diff)
downloadchat-34097faa13dab6ea5d7ac992842126c17ad4d2b9.tar.gz
chat-34097faa13dab6ea5d7ac992842126c17ad4d2b9.tar.bz2
chat-34097faa13dab6ea5d7ac992842126c17ad4d2b9.zip
Patching strange travis eslint problem
-rw-r--r--web/react/components/toggle_modal_button.jsx2
-rw-r--r--web/react/stores/modal_store.jsx2
2 files changed, 2 insertions, 2 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, {
diff --git a/web/react/stores/modal_store.jsx b/web/react/stores/modal_store.jsx
index 45515bc9d..69f43a5cf 100644
--- a/web/react/stores/modal_store.jsx
+++ b/web/react/stores/modal_store.jsx
@@ -28,7 +28,7 @@ class ModalStoreClass extends EventEmitter {
handleEventPayload(payload) {
// toggle event handlers should accept a boolean show/hide value and can accept a map of arguments
- const {type, value, ...args} = payload.action;
+ const {type, value, ...args} = payload.action; //eslint-disable-line no-redeclare
switch (type) {
case ActionTypes.TOGGLE_IMPORT_THEME_MODAL: