Working skin stuff, minus css

This commit is contained in:
David Baker
2015-09-15 13:34:36 +01:00
parent f3b9f8c799
commit 2d0c8ac9ff
9 changed files with 138 additions and 77 deletions

View File

@@ -20,9 +20,7 @@ var React = require("react");
var MatrixClientPeg = require("../../MatrixClientPeg");
var RoomListSorter = require("../../RoomListSorter");
var ComponentBroker = require('../../ComponentBroker');
var RoomTile = ComponentBroker.get("molecules/RoomTile");
var sdk = require('../../index');
module.exports = {
componentWillMount: function() {
@@ -100,16 +98,17 @@ module.exports = {
},
makeRoomTiles: function() {
var that = this;
var RoomTile = sdk.getComponent('molecules.RoomTile');
var self = this;
return this.state.roomList.map(function(room) {
var selected = room.roomId == that.props.selectedRoom;
var selected = room.roomId == self.props.selectedRoom;
return (
<RoomTile
room={room}
key={room.roomId}
selected={selected}
unread={that.state.activityMap[room.roomId] === 1}
highlight={that.state.activityMap[room.roomId] === 2}
unread={self.state.activityMap[room.roomId] === 1}
highlight={self.state.activityMap[room.roomId] === 2}
/>
);
});

View File

@@ -26,12 +26,7 @@ var dis = require("../../dispatcher");
var PAGINATE_SIZE = 20;
var INITIAL_SIZE = 100;
var ComponentBroker = require('../../ComponentBroker');
var tileTypes = {
'm.room.message': ComponentBroker.get('molecules/MessageTile'),
'm.room.member': ComponentBroker.get('molecules/MRoomMemberTile')
};
var sdk = require('../../index');
module.exports = {
getInitialState: function() {
@@ -220,6 +215,11 @@ module.exports = {
},
getEventTiles: function() {
var tileTypes = {
'm.room.message': sdk.getComponent('molecules.MessageTile'),
'm.room.member': sdk.getComponent('molecules.MRoomMemberTile')
};
var ret = [];
var count = 0;