From ea289f0c38ed525f2c9e7061cf1ccf05da22e976 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Thu, 10 Nov 2022 00:12:50 +0300
Subject: [PATCH] Fix custom font for IE

---
 apps/api/documents/api.js                           | 2 +-
 apps/common/main/resources/less/common.less         | 3 +++
 apps/common/main/resources/less/variables.less      | 3 +--
 apps/documenteditor/main/app/controller/Main.js     | 2 +-
 apps/presentationeditor/main/app/controller/Main.js | 2 +-
 apps/spreadsheeteditor/main/app/controller/Main.js  | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js
index 4deffa7b9..7956c7737 100644
--- a/apps/api/documents/api.js
+++ b/apps/api/documents/api.js
@@ -194,7 +194,7 @@
                         } / false / true // if false/true - use as init value in de/pe. use instead of customization.spellcheck parameter
                     },
                     font: {
-                        family: Arial,
+                        family: "Arial",
                     },
                     chat: true,
                     comments: true,
diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less
index aee84bd0f..b7c6f6918 100644
--- a/apps/common/main/resources/less/common.less
+++ b/apps/common/main/resources/less/common.less
@@ -298,4 +298,7 @@ body {
     &.pixel-ratio__1_75 {
         image-rendering: crisp-edges; // FF only
     }
+
+    font-family: @font-family-sans-serif;
+    font-family: @font-family-base;
 }
\ No newline at end of file
diff --git a/apps/common/main/resources/less/variables.less b/apps/common/main/resources/less/variables.less
index 3e15338ea..0fd142adc 100644
--- a/apps/common/main/resources/less/variables.less
+++ b/apps/common/main/resources/less/variables.less
@@ -60,8 +60,7 @@
 @font-family-serif:       Georgia, "Times New Roman", Times, serif;
 @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-family-base:        var(--font-family-base-custom, @font-family-sans-serif), @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 088d99134..896e50b97 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -381,7 +381,7 @@ 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);
+                    this.appOptions.customization.font.family && document.documentElement.style.setProperty("--font-family-base-custom", "'" + this.appOptions.customization.font.family + "'");
                 }
 
                 this.editorConfig.user          =
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index 1108c50fc..73e91e47c 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -340,7 +340,7 @@ 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);
+                    this.appOptions.customization.font.family && document.documentElement.style.setProperty("--font-family-base-custom", "'" + this.appOptions.customization.font.family + "'");
                 }
 
                 this.editorConfig.user          =
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index a9940986e..d439043a1 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -378,7 +378,7 @@ 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);
+                    this.appOptions.customization.font.family && document.documentElement.style.setProperty("--font-family-base-custom", "'" + this.appOptions.customization.font.family + "'");
                 }
 
                 this.editorConfig.user          =