Merge pull request #776 from matrix-org/luke/fix-directory-search-enter

dbkr · web-flow · commit 11a1c8099c4a · 2017-03-30T09:59:42.000+01:00
Only join a room when enter is hit if the join button is shown
diff --git a/src/components/views/elements/DirectorySearchBox.js b/src/components/views/elements/DirectorySearchBox.js
@@ -59,7 +59,7 @@ export default class DirectorySearchBox extends React.Component {
     }
 
     _onKeyUp(ev) {
-        if (ev.key == 'Enter') {
+        if (ev.key == 'Enter' && this.props.showJoinButton) {
             if (this.props.onJoinClick) {
                 this.props.onJoinClick(this.state.value);
             }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ export default class DirectorySearchBox extends React.Component {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`_onKeyUp(ev) {`
`62`		`- if (ev.key == 'Enter') {`
	`62`	`+ if (ev.key == 'Enter' && this.props.showJoinButton) {`
`63`	`63`	`if (this.props.onJoinClick) {`
`64`	`64`	`this.props.onJoinClick(this.state.value);`
`65`	`65`	`}`