Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount
This commit is contained in:
commit
07030a9466
102 changed files with 640 additions and 294 deletions
|
@ -40,7 +40,7 @@ export default createReactClass({
|
|||
};
|
||||
},
|
||||
|
||||
componentWillMount: function() {
|
||||
componentDidMount: function() {
|
||||
this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
|
||||
this.dispatcherRef = dis.register(this._onAction);
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue