OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge commit '26e6632' into rav/roomview_works

pull/21833/head
Richard van der Hoff 2016-02-23 13:25:09 +00:00
parent 21850d7e2f 26e66326a2
commit 4a22fb9763
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/RoomView.js
View File

@ -728,6 +728,7 @@ module.exports = React.createClass({
var result = this.state.searchResults.results[i]; var result = this.state.searchResults.results[i];
var mxEv = result.context.getEvent(); var mxEv = result.context.getEvent();
var roomId = mxEv.getRoomId();
if (!EventTile.haveTileForEvent(mxEv)) { if (!EventTile.haveTileForEvent(mxEv)) {
// XXX: can this ever happen? It will make the result count // XXX: can this ever happen? It will make the result count
@ -736,7 +737,6 @@ module.exports = React.createClass({
} }
if (this.state.searchScope === 'All') { if (this.state.searchScope === 'All') {
var roomId = mxEv.getRoomId();
if(roomId != lastRoomId) { if(roomId != lastRoomId) {
var room = cli.getRoom(roomId); var room = cli.getRoom(roomId);
@ -753,7 +753,7 @@ module.exports = React.createClass({
} }
} }
var resultLink = "#/room/"+this.props.roomId+"/"+mxEv.getId(); var resultLink = "#/room/"+roomId+"/"+mxEv.getId();
ret.push(<SearchResultTile key={mxEv.getId()} ret.push(<SearchResultTile key={mxEv.getId()}
searchResult={result} searchResult={result}