Merge pull request #4421 from matrix-org/revert-4419-bwindels/loadtwemojiearlier
Revert "Fix: load Twemoji before login so complete security gets the right emojis during SAS"
This commit is contained in:
commit
4a2e13c227
2 changed files with 3 additions and 3 deletions
src/components/structures
|
@ -25,6 +25,7 @@ import { DragDropContext } from 'react-beautiful-dnd';
|
|||
import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent} from '../../Keyboard';
|
||||
import PageTypes from '../../PageTypes';
|
||||
import CallMediaHandler from '../../CallMediaHandler';
|
||||
import { fixupColorFonts } from '../../utils/FontManager';
|
||||
import * as sdk from '../../index';
|
||||
import dis from '../../dispatcher';
|
||||
import sessionStore from '../../stores/SessionStore';
|
||||
|
@ -165,6 +166,8 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
|
|||
this._matrixClient.on("sync", this.onSync);
|
||||
this._matrixClient.on("RoomState.events", this.onRoomStateEvents);
|
||||
|
||||
fixupColorFonts();
|
||||
|
||||
this._roomView = React.createRef();
|
||||
this._resizeContainer = React.createRef();
|
||||
}
|
||||
|
|
|
@ -66,7 +66,6 @@ import { storeRoomAliasInCache } from '../../RoomAliasCache';
|
|||
import { defer } from "../../utils/promise";
|
||||
import ToastStore from "../../stores/ToastStore";
|
||||
import * as StorageManager from "../../utils/StorageManager";
|
||||
import { fixupColorFonts } from '../../utils/FontManager';
|
||||
|
||||
/** constants for MatrixChat.state.view */
|
||||
export const VIEWS = {
|
||||
|
@ -245,8 +244,6 @@ export default createReactClass({
|
|||
|
||||
this._pageChanging = false;
|
||||
|
||||
// load emoji font
|
||||
fixupColorFonts();
|
||||
// check we have the right tint applied for this theme.
|
||||
// N.B. we don't call the whole of setTheme() here as we may be
|
||||
// racing with the theme CSS download finishing from index.js
|
||||
|
|
Loading…
Reference in a new issue