summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_list_row.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-03-21 15:08:26 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-03-22 09:29:02 -0400
commit8376ff623380d20b8e4e26fa6abb2dd775930a7c (patch)
tree361bfee19d5fdf46b4dc1dbb96a6c81d72214711 /webapp/components/user_list_row.jsx
parentbb212949f9f90ea3f4f7c07c7e3ca624c2843a90 (diff)
downloadchat-8376ff623380d20b8e4e26fa6abb2dd775930a7c.tar.gz
chat-8376ff623380d20b8e4e26fa6abb2dd775930a7c.tar.bz2
chat-8376ff623380d20b8e4e26fa6abb2dd775930a7c.zip
Adding loading indicator after clicking invite channel member button
Diffstat (limited to 'webapp/components/user_list_row.jsx')
-rw-r--r--webapp/components/user_list_row.jsx9
1 files changed, 6 insertions, 3 deletions
diff --git a/webapp/components/user_list_row.jsx b/webapp/components/user_list_row.jsx
index ed3a29a61..f6fd91688 100644
--- a/webapp/components/user_list_row.jsx
+++ b/webapp/components/user_list_row.jsx
@@ -6,7 +6,7 @@ import PreferenceStore from 'stores/preference_store.jsx';
import * as Utils from 'utils/utils.jsx';
import React from 'react';
-export default function UserListRow({user, actions}) {
+export default function UserListRow({user, actions, actionProps}) {
const nameFormat = PreferenceStore.get(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'name_format', '');
let name = user.username;
@@ -21,6 +21,7 @@ export default function UserListRow({user, actions}) {
<Action
key={index.toString()}
user={user}
+ {...actionProps}
/>
);
});
@@ -56,10 +57,12 @@ export default function UserListRow({user, actions}) {
}
UserListRow.defaultProps = {
- actions: []
+ actions: [],
+ actionProps: {}
};
UserListRow.propTypes = {
user: React.PropTypes.object.isRequired,
- actions: React.PropTypes.arrayOf(React.PropTypes.func)
+ actions: React.PropTypes.arrayOf(React.PropTypes.func),
+ actionProps: React.PropTypes.object
};