mirror of https://github.com/vector-im/riot-web
Move code to make diff less confusing
parent
d5bed78a54
commit
7d712d06a1
|
@ -133,6 +133,12 @@ module.exports = React.createClass({
|
||||||
},
|
},
|
||||||
|
|
||||||
componentWillMount: function() {
|
componentWillMount: function() {
|
||||||
|
this.dispatcherRef = dis.register(this.onAction);
|
||||||
|
MatrixClientPeg.get().on("Room", this.onRoom);
|
||||||
|
MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline);
|
||||||
|
MatrixClientPeg.get().on("Room.accountData", this.onRoomAccountData);
|
||||||
|
MatrixClientPeg.get().on("RoomState.members", this.onRoomStateMember);
|
||||||
|
|
||||||
this.tabComplete = new TabComplete({
|
this.tabComplete = new TabComplete({
|
||||||
allowLooping: false,
|
allowLooping: false,
|
||||||
autoEnterTabComplete: true,
|
autoEnterTabComplete: true,
|
||||||
|
@ -142,12 +148,6 @@ module.exports = React.createClass({
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
this.dispatcherRef = dis.register(this.onAction);
|
|
||||||
MatrixClientPeg.get().on("Room", this.onRoom);
|
|
||||||
MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline);
|
|
||||||
MatrixClientPeg.get().on("Room.accountData", this.onRoomAccountData);
|
|
||||||
MatrixClientPeg.get().on("RoomState.members", this.onRoomStateMember);
|
|
||||||
|
|
||||||
if (this.props.roomAddress[0] == '#') {
|
if (this.props.roomAddress[0] == '#') {
|
||||||
// we always look up the alias from the directory server:
|
// we always look up the alias from the directory server:
|
||||||
// we want the room that the given alias is pointing to
|
// we want the room that the given alias is pointing to
|
||||||
|
|
Loading…
Reference in New Issue