imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'kegan/slash-command-tab-complete' into matthew/roomsettings2

Browse source
This commit is contained in:
Matthew Hodgson 2016-01-13 18:11:11 +00:00
commit dc62f639f2
4 changed files with 59 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/structures/RoomView.js
View file

@ -35,7 +35,9 @@ var sdk = require('../../index');
var CallHandler = require('../../CallHandler');
var TabComplete = require("../../TabComplete");
var MemberEntry = require("../../TabCompleteEntries").MemberEntry;
var CommandEntry = require("../../TabCompleteEntries").CommandEntry;
var Resend = require("../../Resend");
var SlashCommands = require("../../SlashCommands");
var dis = require("../../dispatcher");
var Tinter = require("../../Tinter");
@ -416,7 +418,9 @@ module.exports = React.createClass({
return;
}
this.tabComplete.setCompletionList(
MemberEntry.fromMemberList(room.getJoinedMembers())
MemberEntry.fromMemberList(room.getJoinedMembers()).concat(
CommandEntry.fromStrings(SlashCommands.getCommandList())
)
);
},