Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 34be17c

Browse files
committed
use rte labs setting
1 parent 74527a4 commit 34be17c

File tree

3 files changed

+452
-1
lines changed

3 files changed

+452
-1
lines changed

src/component-index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ module.exports.components['views.rooms.MemberList'] = require('./components/view
8585
module.exports.components['views.rooms.MemberTile'] = require('./components/views/rooms/MemberTile');
8686
module.exports.components['views.rooms.MessageComposer'] = require('./components/views/rooms/MessageComposer');
8787
module.exports.components['views.rooms.MessageComposerInput'] = require('./components/views/rooms/MessageComposerInput');
88+
module.exports.components['views.rooms.MessageComposerInputOld'] = require('./components/views/rooms/MessageComposerInputOld');
8889
module.exports.components['views.rooms.PresenceLabel'] = require('./components/views/rooms/PresenceLabel');
8990
module.exports.components['views.rooms.ReadReceiptMarker'] = require('./components/views/rooms/ReadReceiptMarker');
9091
module.exports.components['views.rooms.RoomHeader'] = require('./components/views/rooms/RoomHeader');

src/components/views/rooms/MessageComposer.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ var Modal = require('../../../Modal');
2121
var sdk = require('../../../index');
2222
var dis = require('../../../dispatcher');
2323

24+
import UserSettingsStore from '../../../UserSettingsStore';
25+
2426

2527
module.exports = React.createClass({
2628
displayName: 'MessageComposer',
@@ -131,7 +133,8 @@ module.exports = React.createClass({
131133
var uploadInputStyle = {display: 'none'};
132134
var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
133135
var TintableSvg = sdk.getComponent("elements.TintableSvg");
134-
var MessageComposerInput = sdk.getComponent("rooms.MessageComposerInput");
136+
var MessageComposerInput = sdk.getComponent("rooms.MessageComposerInput" +
137+
(UserSettingsStore.isFeatureEnabled('rich_text_editor') ? "" : "Old"));
135138

136139
var controls = [];
137140

0 commit comments

Comments
 (0)