imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP all new roomsettings

Browse source
This commit is contained in:
Matthew Hodgson 2016-01-13 13:15:13 +00:00
parent bd226609d0
commit c9c496f0e5
7 changed files with 161 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/structures/RoomView.js
View file

@ -244,7 +244,7 @@ module.exports = React.createClass({
var room = MatrixClientPeg.get().getRoom(this.props.roomId);
if (!room) return;
var color_scheme_event = room.getAccountData("m.room.color_scheme");
var color_scheme_event = room.getAccountData("org.matrix.room.color_scheme");
var color_scheme = {};
if (color_scheme_event) {
color_scheme = color_scheme_event.getContent();
@ -255,7 +255,7 @@ module.exports = React.createClass({
onRoomAccountData: function(room, event) {
if (room.roomId == this.props.roomId) {
if (event.getType === "m.room.color_scheme") {
if (event.getType === "org.matrix.room.color_scheme") {
var color_scheme = event.getContent();
// XXX: we should validate the event
Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
@ -810,7 +810,7 @@ module.exports = React.createClass({
if (new_color_scheme) {
deferreds.push(
MatrixClientPeg.get().setRoomAccountData(
this.state.room.roomId, "m.room.color_scheme", new_color_scheme
this.state.room.roomId, "org.matrix.room.color_scheme", new_color_scheme
)
);
}