summaryrefslogtreecommitdiffstats
path: root/web/react/components/search_bar.jsx
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-26 22:11:42 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-26 22:11:42 -0700
commitaec99ceb9d47d6354ac5a96bbc290126b55d30f5 (patch)
treeecb72b0d51f6edc7341ac5bef0a4f61583f81dde /web/react/components/search_bar.jsx
parente750a8fd361ef6dfce557530a10aaf5ce5a7f37e (diff)
parent28847c6b4b864d747bbfdf5c53354dcb24e5f895 (diff)
downloadchat-aec99ceb9d47d6354ac5a96bbc290126b55d30f5.tar.gz
chat-aec99ceb9d47d6354ac5a96bbc290126b55d30f5.tar.bz2
chat-aec99ceb9d47d6354ac5a96bbc290126b55d30f5.zip
Merge branch 'master' into PLT-25
Diffstat (limited to 'web/react/components/search_bar.jsx')
-rw-r--r--web/react/components/search_bar.jsx9
1 files changed, 8 insertions, 1 deletions
diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx
index e1d36ad7d..0da43e8cd 100644
--- a/web/react/components/search_bar.jsx
+++ b/web/react/components/search_bar.jsx
@@ -105,8 +105,15 @@ export default class SearchBar extends React.Component {
performSearch(terms, isMentionSearch) {
if (terms.length) {
this.setState({isSearching: true});
+
+ // append * if not present
+ let searchTerms = terms;
+ if (searchTerms.search(/\*\s*$/) === -1) {
+ searchTerms = searchTerms + '*';
+ }
+
client.search(
- terms,
+ searchTerms,
(data) => {
this.setState({isSearching: false});
if (utils.isMobile()) {