mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

implement latest skin

Browse source
This commit is contained in:
Matthew Hodgson 2015-07-15 04:16:38 +01:00
parent c0bd574997
commit 9b384e52b5
27 changed files with 172 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/molecules/MessageComposer.js
View file

@ -54,7 +54,7 @@ module.exports = {
};
}
MatrixClientPeg.get().sendMessage(this.props.roomId, content).then(function() {
MatrixClientPeg.get().sendMessage(this.props.room.roomId, content).then(function() {
dis.dispatch({
action: 'message_sent'
});

6
src/controllers/organisms/RoomView.js
View file

@ -227,6 +227,10 @@ module.exports = {
var mxEv = this.state.room.timeline[i];
var TileType = tileTypes[mxEv.getType()];
var continuation = false;
var last = false;
if (i == this.state.room.timeline.length - 1) {
last = true;
}
if (i > 0 &&
count < this.state.messageCap - 1 &&
this.state.room.timeline[i].sender &&
@ -238,7 +242,7 @@ module.exports = {
}
if (!TileType) continue;
ret.unshift(
<TileType key={mxEv.getId()} mxEvent={mxEv} continuation={continuation}/>
<TileType key={mxEv.getId()} mxEvent={mxEv} continuation={continuation} last={last}/>
);
++count;
}