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

Move tinter init to MatrixChat 

This is a much better place for it to live
pull/21833/head
Travis Ralston 2018-10-15 14:41:00 -06:00
parent f8fd0c34cb
commit 6323d78b0c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/MatrixClientPeg.js
View File

@ -27,7 +27,6 @@ import createMatrixClient from './utils/createMatrixClient';
import SettingsStore from './settings/SettingsStore';
import MatrixActionCreators from './actions/MatrixActionCreators';
import {phasedRollOutExpiredForUser} from "./PhasedRollOut";
import Tinter from "./Tinter";
interface MatrixClientCreds {
homeserverUrl: string,
@ -134,9 +133,6 @@ class MatrixClientPeg {
}
}
const color_scheme = SettingsStore.getValue("roomColor");
Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
// Connect the matrix client to the dispatcher
MatrixActionCreators.start(this.matrixClient);

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

@ -1403,6 +1403,11 @@ export default React.createClass({
break;
}
});
// 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
const color_scheme = SettingsStore.getValue("roomColor");
Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
},
/**