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

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

remove SBIX font and fallback to native emoji
pull/21833/head
Bruno Windels 2019-05-22 11:50:06 +00:00 committed by GitHub
parent 983f39cb5f 7a20dbe657
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
// but doesn't support the check below with content blocking enabled.
if (navigator.userAgent.includes("Firefox")) {
return true;
colrFontSupported = true;
return colrFontSupported;
}
try {
@ -75,15 +76,11 @@ export async function fixupColorFonts() {
return;
}
// we programatically add the right fontface.
let font;
if (await isColrFontSupported()) {
font = new FontFace("Twemoji",
const font = new FontFace("Twemoji",
`url('${require("../../res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2")}')`, {});
} else {
font = new FontFace("Twemoji",
`url('${require("../../res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2")}')`, {});
document.fonts.add(font);
}
document.fonts.add(font);
// if not supported, the browser will fall back to one of the native fonts specified.
}