OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-10-23 04:44:19 +00:00
parent 11a0437df1 8ff1da11ed
commit a5ea073350
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/MatrixChat.js
View File

@ -1407,8 +1407,8 @@ export default React.createClass({
// Fire the tinter right on startup to ensure the default theme is applied // Fire the tinter right on startup to ensure the default theme is applied
// A later sync can/will correct the tint to be the right value for the user // A later sync can/will correct the tint to be the right value for the user
const color_scheme = SettingsStore.getValue("roomColor"); const colorScheme = SettingsStore.getValue("roomColor");
Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color); Tinter.tint(colorScheme.primary_color, colorScheme.secondary_color);
}, },
/** /**

8
src/components/structures/RoomView.js
View File

@ -678,8 +678,8 @@ module.exports = React.createClass({
if (!room) return; if (!room) return;
console.log("Tinter.tint from updateTint"); console.log("Tinter.tint from updateTint");
const color_scheme = SettingsStore.getValue("roomColor", room.roomId); const colorScheme = SettingsStore.getValue("roomColor", room.roomId);
Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color); Tinter.tint(colorScheme.primary_color, colorScheme.secondary_color);
}, },
onAccountData: function(event) { onAccountData: function(event) {
@ -694,10 +694,10 @@ module.exports = React.createClass({
if (room.roomId == this.state.roomId) { if (room.roomId == this.state.roomId) {
const type = event.getType(); const type = event.getType();
if (type === "org.matrix.room.color_scheme") { if (type === "org.matrix.room.color_scheme") {
const color_scheme = event.getContent(); const colorScheme = event.getContent();
// XXX: we should validate the event // XXX: we should validate the event
console.log("Tinter.tint from onRoomAccountData"); console.log("Tinter.tint from onRoomAccountData");
Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color); Tinter.tint(colorScheme.primary_color, colorScheme.secondary_color);
} else if (type === "org.matrix.room.preview_urls" || type === "im.vector.web.settings") { } else if (type === "org.matrix.room.preview_urls" || type === "im.vector.web.settings") {
// non-e2ee url previews are stored in legacy event type `org.matrix.room.preview_urls` // non-e2ee url previews are stored in legacy event type `org.matrix.room.preview_urls`
this._updatePreviewUrlVisibility(room); this._updatePreviewUrlVisibility(room);