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

Merge pull request #3011 from matrix-org/bwindels/removesbix

Browse source 
remove SBIX font and fallback to native emoji
This commit is contained in:
Bruno Windels 2019-05-22 11:50:06 +00:00 committed by GitHub
commit e44f3b65e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2
View file

Binary file not shown.

13
src/utils/FontManager.js
View file

@ -31,7 +31,8 @@ async function isColrFontSupported() {
// Firefox has supported COLR fonts since version 26 // Firefox has supported COLR fonts since version 26
// but doesn't support the check below with content blocking enabled. // but doesn't support the check below with content blocking enabled.
if (navigator.userAgent.includes("Firefox")) { if (navigator.userAgent.includes("Firefox")) {
return true; colrFontSupported = true;
return colrFontSupported;
} }
try { try {
@ -75,15 +76,11 @@ export async function fixupColorFonts() {
return; return;
} }
// we programatically add the right fontface.
let font;
if (await isColrFontSupported()) { if (await isColrFontSupported()) {
font = new FontFace("Twemoji", const font = new FontFace("Twemoji",
`url('${require("../../res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2")}')`, {}); `url('${require("../../res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2")}')`, {});
} else { document.fonts.add(font);
font = new FontFace("Twemoji",
`url('${require("../../res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2")}')`, {});
} }
document.fonts.add(font); // if not supported, the browser will fall back to one of the native fonts specified.
} }