matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

Merge branch 'develop' into wmwragg/direct-chat-sublist

Browse Source
This commit is contained in:
wmwragg
2016-08-30 11:22:31 +01:00
parent ff3ad47be7 5f233d75f2
commit 7b7a77bad0
19 changed files with 334 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/RoomSubList.js
View File

@@ -456,7 +456,7 @@ var RoomSubList = React.createClass({
// is run with historical room tag data, after that there should only be undefined
// in the list at a time anyway.
for (let i = 0; i < list.length; i++) {
if (list[i].tags[self.props.tagName].order === undefined) {
if (list[i].tags[self.props.tagName] && list[i].tags[self.props.tagName].order === undefined) {
MatrixClientPeg.get().setRoomTag(list[i].roomId, self.props.tagName, {order: (order + 1.0) / 2.0}).finally(function() {
// Do any final stuff here
}).fail(function(err) {