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

Merge pull request #11684 from matrix-org/backport-11673-to-staging 

[Backport staging] Fix Emoji font on Safari 17
pull/28217/head
Andy Balaam 2023-09-29 09:49:39 +01:00 committed by GitHub
parent 81c62e51c4 a3fc8c69a0
commit 42e1805cbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/utils/FontManager.ts
View File

@ -31,10 +31,11 @@ function safariVersionCheck(ua: string): boolean {
const safariVersionStr = safariVersionMatch[2]; const safariVersionStr = safariVersionMatch[2];
const macOSVersion = macOSVersionStr.split("_").map((n) => parseInt(n, 10)); const macOSVersion = macOSVersionStr.split("_").map((n) => parseInt(n, 10));
const safariVersion = safariVersionStr.split(".").map((n) => parseInt(n, 10)); const safariVersion = safariVersionStr.split(".").map((n) => parseInt(n, 10));
const colrFontSupported = macOSVersion[0] >= 10 && macOSVersion[1] >= 14 && safariVersion[0] >= 12; const colrFontSupported =
// https://www.colorfonts.wtf/ states safari supports COLR fonts from this version on macOSVersion[0] >= 10 && macOSVersion[1] >= 14 && safariVersion[0] >= 12 && safariVersion[0] < 17;
// https://www.colorfonts.wtf/ states Safari supports COLR fonts from this version on but Safari 17 breaks it
logger.log( logger.log(
`COLR support on Safari requires macOS 10.14 and Safari 12, ` + `COLR support on Safari requires macOS 10.14 and Safari 12-16, ` +
`detected Safari ${safariVersionStr} on macOS ${macOSVersionStr}, ` + `detected Safari ${safariVersionStr} on macOS ${macOSVersionStr}, ` +
`COLR supported: ${colrFontSupported}`, `COLR supported: ${colrFontSupported}`,
); );