Revert "Merge pull request #2348 from matrix-org/bwindels/roomgridview-experimental"

This reverts commit ece5cb1fcc, reversing
changes made to 64a3d2521c.

src/components/views/rooms/MessageComposerInput.js

@@ -38,6 +38,8 @@ import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Analytics from '../../../Analytics';
 
+import dis from '../../../dispatcher';
+
 import * as RichText from '../../../RichText';
 import * as HtmlUtils from '../../../HtmlUtils';
 import Autocomplete from './Autocomplete';
@@ -55,6 +57,7 @@ import {
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import {makeUserPermalink} from "../../../matrix-to";
 import ReplyPreview from "./ReplyPreview";
+import RoomViewStore from '../../../stores/RoomViewStore';
 import ReplyThread from "../elements/ReplyThread";
 import {ContentHelpers} from 'matrix-js-sdk';
 
@@ -108,6 +111,15 @@ const SLATE_SCHEMA = {
     },
 };
 
+function onSendMessageFailed(err, room) {
+    // XXX: temporary logging to try to diagnose
+    // https://github.com/vector-im/riot-web/issues/3148
+    console.log('MessageComposer got send failure: ' + err.name + '('+err+')');
+    dis.dispatch({
+        action: 'message_send_failed',
+    });
+}
+
 function rangeEquals(a: Range, b: Range): boolean {
     return (a.anchor.key === b.anchor.key
         && a.anchor.offset === b.anchorOffset
@@ -117,18 +129,6 @@ function rangeEquals(a: Range, b: Range): boolean {
         && a.isBackward === b.isBackward);
 }
 
-class NoopHistoryManager {
-    getItem() {}
-    save() {}
-
-    get currentIndex() { return 0; }
-    set currentIndex(_) {}
-
-    get history() { return []; }
-    set history(_) {}
-}
-
-
 /*
  * The textInput part of the MessageComposer
  */
@@ -144,7 +144,6 @@ export default class MessageComposerInput extends React.Component {
         onFilesPasted: PropTypes.func,
 
         onInputStateChanged: PropTypes.func,
-        roomViewStore: PropTypes.object.isRequired,
     };
 
     client: MatrixClient;
@@ -339,31 +338,18 @@ export default class MessageComposerInput extends React.Component {
     }
 
     componentWillMount() {
-        this.dispatcherRef = this.props.roomViewStore.getDispatcher().register(this.onAction);
-        if (this.props.isGrid) {
-            this.historyManager = new NoopHistoryManager();
-        } else {
-            this.historyManager = new ComposerHistoryManager(this.props.room.roomId, 'mx_slate_composer_history_');
-        }
+        this.dispatcherRef = dis.register(this.onAction);
+        this.historyManager = new ComposerHistoryManager(this.props.room.roomId, 'mx_slate_composer_history_');
     }
 
     componentWillUnmount() {
-        this.props.roomViewStore.getDispatcher().unregister(this.dispatcherRef);
+        dis.unregister(this.dispatcherRef);
     }
 
     _collectEditor = (e) => {
         this._editor = e;
     }
 
-    onSendMessageFailed = (err, room) => {
-        // XXX: temporary logging to try to diagnose
-        // https://github.com/vector-im/riot-web/issues/3148
-        console.log('MessageComposer got send failure: ' + err.name + '('+err+')');
-        this.props.roomViewStore.getDispatcher().dispatch({
-            action: 'message_send_failed',
-        });
-    }
-
     onAction = (payload) => {
         const editorState = this.state.editorState;
 
@@ -1129,7 +1115,7 @@ export default class MessageComposerInput extends React.Component {
             return true;
         }
 
-        const replyingToEv = this.props.roomViewStore.getQuotingEvent();
+        const replyingToEv = RoomViewStore.getQuotingEvent();
         const mustSendHTML = Boolean(replyingToEv);
 
         if (this.state.isRichTextEnabled) {
@@ -1217,18 +1203,18 @@ export default class MessageComposerInput extends React.Component {
 
             // Clear reply_to_event as we put the message into the queue
             // if the send fails, retry will handle resending.
-            this.props.roomViewStore.getDispatcher().dispatch({
+            dis.dispatch({
                 action: 'reply_to_event',
                 event: null,
             });
         }
 
         this.client.sendMessage(this.props.room.roomId, content).then((res) => {
-            this.props.roomViewStore.getDispatcher().dispatch({
+            dis.dispatch({
                 action: 'message_sent',
             });
         }).catch((e) => {
-            this.onSendMessageFailed(e, this.props.room);
+            onSendMessageFailed(e, this.props.room);
         });
 
         this.setState({
@@ -1599,7 +1585,7 @@ export default class MessageComposerInput extends React.Component {
         return (
             <div className="mx_MessageComposer_input_wrapper" onClick={this.focusComposer}>
                 <div className="mx_MessageComposer_autocomplete_wrapper">
-                    <ReplyPreview roomViewStore={this.props.roomViewStore} />
+                    <ReplyPreview />
                     <Autocomplete
                         ref={(e) => this.autocomplete = e}
                         room={this.props.room}