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

Merge pull request #140 from matrix-org/dbkr/fix_tab_complete 

Fix tab complete
pull/21833/head
David Baker 2016-02-08 14:19:06 +00:00
parent 7ccce1dc91 500c12b1f2
commit 05f1e1e205
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -523,7 +523,7 @@ module.exports = React.createClass({
onRoomStateMember: function(ev, state, member) { onRoomStateMember: function(ev, state, member) {
if (member.roomId === this.props.roomId) { if (member.roomId === this.props.roomId) {
// a member state changed in this room, refresh the tab complete list // a member state changed in this room, refresh the tab complete list
this._updateTabCompleteList(this.state.room); this._updateTabCompleteList();
var room = MatrixClientPeg.get().getRoom(this.props.roomId); var room = MatrixClientPeg.get().getRoom(this.props.roomId);
if (!room) return; if (!room) return;
@ -606,7 +606,7 @@ module.exports = React.createClass({
roomView.addEventListener('dragend', this.onDragLeaveOrEnd); roomView.addEventListener('dragend', this.onDragLeaveOrEnd);
} }
this._updateTabCompleteList(this.state.room); this._updateTabCompleteList();
// XXX: EVIL HACK to autofocus inviting on empty rooms. // XXX: EVIL HACK to autofocus inviting on empty rooms.
// We use the setTimeout to avoid racing with focus_composer. // We use the setTimeout to avoid racing with focus_composer.
@ -620,12 +620,12 @@ module.exports = React.createClass({
} }
}, },
_updateTabCompleteList: new rate_limited_func(function(room) { _updateTabCompleteList: new rate_limited_func(function() {
if (!room || !this.tabComplete) { if (!this.state.room || !this.tabComplete) {
return; return;
} }
this.tabComplete.setCompletionList( this.tabComplete.setCompletionList(
MemberEntry.fromMemberList(room.getJoinedMembers()).concat( MemberEntry.fromMemberList(this.state.room.getJoinedMembers()).concat(
CommandEntry.fromCommands(SlashCommands.getCommandList()) CommandEntry.fromCommands(SlashCommands.getCommandList())
) )
); );