Fix custom fonts (several fonts, fonts with digits or spaces)

This commit is contained in:
Julia Radzhabova 2022-11-10 01:31:07 +03:00
parent ea289f0c38
commit 1afba4dde2
3 changed files with 30 additions and 3 deletions

View file

@ -381,7 +381,16 @@ define([
Common.Utils.InternalSettings.set("save-guest-username", !!value);
}
if (this.appOptions.customization.font) {
this.appOptions.customization.font.family && document.documentElement.style.setProperty("--font-family-base-custom", "'" + this.appOptions.customization.font.family + "'");
if (this.appOptions.customization.font.family && typeof this.appOptions.customization.font.family === 'string') {
var arr = this.appOptions.customization.font.family.split(',');
for (var i=0; i<arr.length; i++) {
var item = arr[i].trim();
if (item && (/[\s0-9\.]/).test(item)) {
arr[i] = "'" + item + "'";
}
}
document.documentElement.style.setProperty("--font-family-base-custom", arr.join(','));
}
}
this.editorConfig.user =

View file

@ -340,7 +340,16 @@ define([
Common.Utils.InternalSettings.set("save-guest-username", !!value);
}
if (this.appOptions.customization.font) {
this.appOptions.customization.font.family && document.documentElement.style.setProperty("--font-family-base-custom", "'" + this.appOptions.customization.font.family + "'");
if (this.appOptions.customization.font.family && typeof this.appOptions.customization.font.family === 'string') {
var arr = this.appOptions.customization.font.family.split(',');
for (var i=0; i<arr.length; i++) {
var item = arr[i].trim();
if (item && (/[\s0-9\.]/).test(item)) {
arr[i] = "'" + item + "'";
}
}
document.documentElement.style.setProperty("--font-family-base-custom", arr.join(','));
}
}
this.editorConfig.user =

View file

@ -378,7 +378,16 @@ define([
Common.Utils.InternalSettings.set("save-guest-username", !!value);
}
if (this.appOptions.customization.font) {
this.appOptions.customization.font.family && document.documentElement.style.setProperty("--font-family-base-custom", "'" + this.appOptions.customization.font.family + "'");
if (this.appOptions.customization.font.family && typeof this.appOptions.customization.font.family === 'string') {
var arr = this.appOptions.customization.font.family.split(',');
for (var i=0; i<arr.length; i++) {
var item = arr[i].trim();
if (item && (/[\s0-9\.]/).test(item)) {
arr[i] = "'" + item + "'";
}
}
document.documentElement.style.setProperty("--font-family-base-custom", arr.join(','));
}
}
this.editorConfig.user =