Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
use rte labs setting
  • Loading branch information
aviraldg committed Jun 13, 2016
1 parent 74527a4 commit 34be17c
Show file tree
Hide file tree
Showing 3 changed files with 452 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/component-index.js
Expand Up @@ -85,6 +85,7 @@ module.exports.components['views.rooms.MemberList'] = require('./components/view
module.exports.components['views.rooms.MemberTile'] = require('./components/views/rooms/MemberTile');
module.exports.components['views.rooms.MessageComposer'] = require('./components/views/rooms/MessageComposer');
module.exports.components['views.rooms.MessageComposerInput'] = require('./components/views/rooms/MessageComposerInput');
module.exports.components['views.rooms.MessageComposerInputOld'] = require('./components/views/rooms/MessageComposerInputOld');
module.exports.components['views.rooms.PresenceLabel'] = require('./components/views/rooms/PresenceLabel');
module.exports.components['views.rooms.ReadReceiptMarker'] = require('./components/views/rooms/ReadReceiptMarker');
module.exports.components['views.rooms.RoomHeader'] = require('./components/views/rooms/RoomHeader');
Expand Down
5 changes: 4 additions & 1 deletion src/components/views/rooms/MessageComposer.js
Expand Up @@ -21,6 +21,8 @@ var Modal = require('../../../Modal');
var sdk = require('../../../index');
var dis = require('../../../dispatcher');

import UserSettingsStore from '../../../UserSettingsStore';


module.exports = React.createClass({
displayName: 'MessageComposer',
Expand Down Expand Up @@ -131,7 +133,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 = [];

Expand Down

0 comments on commit 34be17c

Please sign in to comment.