From 33391a31105d601ad76eb0da98ab8afaf810a06b Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 16 Apr 2020 09:25:18 +0000 Subject: [PATCH] Revert "Fix: load Twemoji before login so complete security gets the right emojis during SAS" --- src/components/structures/LoggedInView.tsx | 3 +++ src/components/structures/MatrixChat.js | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx index f90ae18f00..9de2aac8e9 100644 --- a/src/components/structures/LoggedInView.tsx +++ b/src/components/structures/LoggedInView.tsx @@ -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 { this._matrixClient.on("sync", this.onSync); this._matrixClient.on("RoomState.events", this.onRoomStateEvents); + fixupColorFonts(); + this._roomView = React.createRef(); this._resizeContainer = React.createRef(); } diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 4b269ceae4..519b39d436 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -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