summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_list.jsx
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-03-22 08:08:46 -0700
committerCorey Hulen <corey@hulen.com>2016-03-22 08:08:46 -0700
commit6568e15023c009c96a46f022236f5fd4415445c0 (patch)
treef17fd6d8fce9feb44adc17a4880a4f7dc5cb6897 /webapp/components/user_list.jsx
parentbb212949f9f90ea3f4f7c07c7e3ca624c2843a90 (diff)
parent4e3eb2bb181ff6baad9911e231558eee0a08291c (diff)
downloadchat-6568e15023c009c96a46f022236f5fd4415445c0.tar.gz
chat-6568e15023c009c96a46f022236f5fd4415445c0.tar.bz2
chat-6568e15023c009c96a46f022236f5fd4415445c0.zip
Merge pull request #2498 from hmhealey/plt2285
PLT-2285 Adding spinner after clicking invite channel member button
Diffstat (limited to 'webapp/components/user_list.jsx')
-rw-r--r--webapp/components/user_list.jsx7
1 files changed, 5 insertions, 2 deletions
diff --git a/webapp/components/user_list.jsx b/webapp/components/user_list.jsx
index 2140158e6..b5d42decc 100644
--- a/webapp/components/user_list.jsx
+++ b/webapp/components/user_list.jsx
@@ -18,6 +18,7 @@ export default class UserList extends React.Component {
key={user.id}
user={user}
actions={this.props.actions}
+ actionProps={this.props.actionProps}
/>
);
});
@@ -42,10 +43,12 @@ export default class UserList extends React.Component {
UserList.defaultProps = {
users: [],
- actions: []
+ actions: [],
+ actionProps: {}
};
UserList.propTypes = {
users: React.PropTypes.arrayOf(React.PropTypes.object),
- actions: React.PropTypes.arrayOf(React.PropTypes.func)
+ actions: React.PropTypes.arrayOf(React.PropTypes.func),
+ actionProps: React.PropTypes.object
};