PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4421 from matrix-org/revert-4419-bwindels/loadtwemojiearlier

Browse source 
Revert "Fix: load Twemoji before login so complete security gets the right emojis during SAS"
This commit is contained in:
Bruno Windels 2020-04-16 09:26:06 +00:00 committed by GitHub
commit 4a2e13c227
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/structures/LoggedInView.tsx
View file

@ -25,6 +25,7 @@ import { DragDropContext } from 'react-beautiful-dnd';
import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent} from '../../Keyboard'; import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent} from '../../Keyboard';
import PageTypes from '../../PageTypes'; import PageTypes from '../../PageTypes';
import CallMediaHandler from '../../CallMediaHandler'; import CallMediaHandler from '../../CallMediaHandler';
import { fixupColorFonts } from '../../utils/FontManager';
import * as sdk from '../../index'; import * as sdk from '../../index';
import dis from '../../dispatcher'; import dis from '../../dispatcher';
import sessionStore from '../../stores/SessionStore'; 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("sync", this.onSync);
this._matrixClient.on("RoomState.events", this.onRoomStateEvents); this._matrixClient.on("RoomState.events", this.onRoomStateEvents);
fixupColorFonts();
this._roomView = React.createRef(); this._roomView = React.createRef();
this._resizeContainer = React.createRef(); this._resizeContainer = React.createRef();
} }

3
src/components/structures/MatrixChat.js
View file

@ -66,7 +66,6 @@ import { storeRoomAliasInCache } from '../../RoomAliasCache';
import { defer } from "../../utils/promise"; import { defer } from "../../utils/promise";
import ToastStore from "../../stores/ToastStore"; import ToastStore from "../../stores/ToastStore";
import * as StorageManager from "../../utils/StorageManager"; import * as StorageManager from "../../utils/StorageManager";
import { fixupColorFonts } from '../../utils/FontManager';
/** constants for MatrixChat.state.view */ /** constants for MatrixChat.state.view */
export const VIEWS = { export const VIEWS = {
@ -245,8 +244,6 @@ export default createReactClass({
this._pageChanging = false; this._pageChanging = false;
// load emoji font
fixupColorFonts();
// check we have the right tint applied for this theme. // 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 // 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 // racing with the theme CSS download finishing from index.js