Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-11-08 10:55:59 +00:00
commit b496eec523

View file

@ -94,7 +94,7 @@ export default React.createClass({
let roomList = this.state.rooms; let roomList = this.state.rooms;
if (query) { if (query) {
roomList = roomList.filter((room) => { roomList = roomList.filter((room) => {
const matchesName = (room.name || "").toLowerCase().include(query); const matchesName = (room.name || "").toLowerCase().includes(query);
const matchesAlias = (room.canonicalAlias || "").toLowerCase().includes(query); const matchesAlias = (room.canonicalAlias || "").toLowerCase().includes(query);
return matchesName || matchesAlias; return matchesName || matchesAlias;
}); });