From f499e31c05506c103df55b2b5c1fb95c5d62ef11 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 9 Nov 2022 14:45:46 +0300 Subject: [PATCH] Set custom font family (add api parameter customization.font.family) --- apps/api/documents/api.js | 3 +++ apps/common/main/resources/less/variables.less | 1 + apps/documenteditor/main/app/controller/Main.js | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 78d99621c..dda80060d 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -193,6 +193,9 @@ change: false/true // hide/show feature in de/pe/sse } / false / true // if false/true - use as init value in de/pe. use instead of customization.spellcheck parameter }, + font: { + font-family: Arial, + }, chat: true, comments: true, zoom: 100, diff --git a/apps/common/main/resources/less/variables.less b/apps/common/main/resources/less/variables.less index 0660a8c87..3e15338ea 100644 --- a/apps/common/main/resources/less/variables.less +++ b/apps/common/main/resources/less/variables.less @@ -61,6 +61,7 @@ @font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; @font-family-tahoma: tahoma, arial, verdana, sans-serif; @font-family-base: @font-family-sans-serif; +@font-family-base: var(--font-family-base-custom, @font-family-sans-serif); @font-size-base: 11px; @font-size-large: 13px; diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 48cb93025..ac690ac12 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -380,6 +380,11 @@ define([ Common.Utils.InternalSettings.set("guest-username", value); 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); + } + + this.editorConfig.user = this.appOptions.user = Common.Utils.fillUserInfo(this.editorConfig.user, this.editorConfig.lang, value ? (value + ' (' + this.appOptions.guestName + ')' ) : this.textAnonymous, Common.localStorage.getItem("guest-id") || ('uid-' + Date.now())); @@ -1418,7 +1423,8 @@ define([ }); } } else if (!this.appOptions.isDesktopApp && !this.appOptions.canBrandingExt && - this.editorConfig && this.editorConfig.customization && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)) { + this.editorConfig && this.editorConfig.customization && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo || + this.editorConfig.customization.font.family)) { Common.UI.warning({ title: this.textPaidFeature, msg : this.textCustomLoader,