matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Merge branch 'develop' into feature-autocomplete

Browse Source
This commit is contained in:
Aviral Dasgupta
2016-06-17 00:37:39 +05:30
parent 4bc8ec3e6d 624e34c48a
commit 769b3f0c2a
12 changed files with 1075 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/rooms/MessageComposer.js
View File

@@ -22,6 +22,8 @@ var sdk = require('../../../index');
var dis = require('../../../dispatcher');
import Autocomplete from './Autocomplete';
import UserSettingsStore from '../../../UserSettingsStore';
module.exports = React.createClass({
displayName: 'MessageComposer',
@@ -144,7 +146,8 @@ module.exports = React.createClass({
var uploadInputStyle = {display: 'none'};
var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
var TintableSvg = sdk.getComponent("elements.TintableSvg");
var MessageComposerInput = sdk.getComponent("rooms.MessageComposerInput");
var MessageComposerInput = sdk.getComponent("rooms.MessageComposerInput" +
(UserSettingsStore.isFeatureEnabled('rich_text_editor') ? "" : "Old"));
var controls = [];