Merge pull request #1335 from hikaru-y/fix-editor-fontfamily

Quote font family names
This commit is contained in:
Damien Elmes 2021-08-20 14:39:29 +10:00 committed by GitHub
commit ce4dcab9e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -105,10 +105,18 @@ export class EditingArea extends HTMLDivElement {
firstRule.style.color = color; firstRule.style.color = color;
} }
quoteFontFamily(fontFamily: string): string {
// generic families (e.g. sans-serif) must not be quoted
if (!/^[a-z|-]+$/.test(fontFamily)) {
fontFamily = `"${fontFamily}"`;
}
return fontFamily;
}
setBaseStyling(fontFamily: string, fontSize: string, direction: string): void { setBaseStyling(fontFamily: string, fontSize: string, direction: string): void {
const styleSheet = this.baseStyle.sheet as CSSStyleSheet; const styleSheet = this.baseStyle.sheet as CSSStyleSheet;
const firstRule = styleSheet.cssRules[0] as CSSStyleRule; const firstRule = styleSheet.cssRules[0] as CSSStyleRule;
firstRule.style.fontFamily = fontFamily; firstRule.style.fontFamily = this.quoteFontFamily(fontFamily);
firstRule.style.fontSize = fontSize; firstRule.style.fontSize = fontSize;
firstRule.style.direction = direction; firstRule.style.direction = direction;
} }