diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-03-29 11:07:10 -0400 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2017-03-29 08:07:10 -0700 |
commit | 8dde651ded58a28d29dfc75c2856450c3a9b5be1 (patch) | |
tree | 32c35ff3fc5dfa21c109f0d716ed65e92f67bb78 | |
parent | 2f15523fe88c3a382abda1e64b2ef962c3ab5128 (diff) | |
download | chat-8dde651ded58a28d29dfc75c2856450c3a9b5be1.tar.gz chat-8dde651ded58a28d29dfc75c2856450c3a9b5be1.tar.bz2 chat-8dde651ded58a28d29dfc75c2856450c3a9b5be1.zip |
Remove user from list when selected in DM modal (#5884)
-rw-r--r-- | webapp/components/multiselect/multiselect.jsx | 14 | ||||
-rw-r--r-- | webapp/components/sidebar.jsx | 5 |
2 files changed, 17 insertions, 2 deletions
diff --git a/webapp/components/multiselect/multiselect.jsx b/webapp/components/multiselect/multiselect.jsx index a3e32dccf..f6d6b5d56 100644 --- a/webapp/components/multiselect/multiselect.jsx +++ b/webapp/components/multiselect/multiselect.jsx @@ -111,7 +111,8 @@ export default class MultiSelect extends React.Component { } render() { - const options = this.props.options; + const options = Object.assign([], this.props.options); + const values = this.props.values; let numRemainingText; if (this.props.numRemainingText) { @@ -142,6 +143,17 @@ export default class MultiSelect extends React.Component { ); } + const valueMap = {}; + for (let i = 0; i < values.length; i++) { + valueMap[values[i].id] = true; + } + + for (let i = options.length - 1; i >= 0; i--) { + if (valueMap[options[i].id]) { + options.splice(i, 1); + } + } + if (options && options.length > this.props.perPage) { const pageStart = this.state.page * this.props.perPage; const pageEnd = pageStart + this.props.perPage; diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx index b9356c5a1..b6a5b0ba8 100644 --- a/webapp/components/sidebar.jsx +++ b/webapp/components/sidebar.jsx @@ -677,7 +677,10 @@ export default class Sidebar extends React.Component { <li key='more'> <a href='#' - onClick={() => this.showMoreDirectChannelsModal()} + onClick={(e) => { + e.preventDefault(); + this.showMoreDirectChannelsModal(); + }} > <FormattedMessage id='sidebar.moreElips' |