Rest of commit adding messagecomposer, and put li's in ul.
parent
a0c5fb4a8b
commit
b2843b09bc
|
@ -2,10 +2,17 @@
|
||||||
display: table-cell;
|
display: table-cell;
|
||||||
padding-left: 5px;
|
padding-left: 5px;
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
|
position: relative;
|
||||||
|
padding-bottom: 70px
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_RoomView ul {
|
.mx_RoomView ul {
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
|
margin: 0px;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
overflow-y: scroll;
|
overflow-y: scroll;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.mx_RoomView li {
|
||||||
|
list-style-type: none;
|
||||||
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
var React = require('react');
|
var React = require('react');
|
||||||
var MessageTile = require('../molecules/MessageTile');
|
var MessageTile = require('../molecules/MessageTile');
|
||||||
var RoomHeader = require('../molecules/RoomHeader');
|
var RoomHeader = require('../molecules/RoomHeader');
|
||||||
|
var MessageComposer = require('../molecules/MessageComposer');
|
||||||
|
|
||||||
var MatrixClientPeg = require("../MatrixClientPeg");
|
var MatrixClientPeg = require("../MatrixClientPeg");
|
||||||
|
|
||||||
|
@ -35,7 +36,7 @@ module.exports = React.createClass({
|
||||||
getMessageTiles: function() {
|
getMessageTiles: function() {
|
||||||
return this.state.room.timeline.map(function(mxEv) {
|
return this.state.room.timeline.map(function(mxEv) {
|
||||||
return (
|
return (
|
||||||
<MessageTile mxEvent={mxEv} key={mxEv.getId()} />
|
<li><MessageTile mxEvent={mxEv} key={mxEv.getId()} /></li>
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@ -47,6 +48,7 @@ module.exports = React.createClass({
|
||||||
<ul>
|
<ul>
|
||||||
{this.getMessageTiles()}
|
{this.getMessageTiles()}
|
||||||
</ul>
|
</ul>
|
||||||
|
<MessageComposer room={this.state.room} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue