use rte labs setting

matrix-org · Jun 13, 2016 · 34be17cc7e9f93676cc2874dafa68713ccd8daea · 34be17c
1 parent 74527a4
commit 34be17cc7e9f93676cc2874dafa68713ccd8daea
Unified Split

Showing with 452 additions and 1 deletion.

+1 −0 src/component-index.js

+4 −1 src/components/views/rooms/MessageComposer.js

+447 −0 src/components/views/rooms/MessageComposerInputOld.js
diff --git a/src/component-index.js b/src/component-index.js
@@ -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');
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
@@ -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',
@@ -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 = [];