Merge pull request #1608 from hmhealey/safarifonts

Changed font changing code to use jquery to fix Safari weirdness

1 files changed, 13 insertions, 9 deletions

diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 788d8a45c..0a52f5b37 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -695,15 +695,19 @@ export function applyTheme(theme) {
 }
 
 export function applyFont(fontName) {
-    const body = document.querySelector('body');
-    const keys = Object.getOwnPropertyNames(body.classList);
-    keys.forEach((k) => {
-        const className = body.classList[k];
-        if (className && className.lastIndexOf('font') === 0) {
-            body.classList.remove(className);
+    const body = $('body');
+
+    for (const key of Reflect.ownKeys(Constants.FONTS)) {
+        const className = Constants.FONTS[key];
+
+        if (fontName === key) {
+            if (!body.hasClass(className)) {
+                body.addClass(className);
+            }
+        } else {
+            body.removeClass(className);
         }
-    });
-    body.classList.add(Constants.FONTS[fontName]);
+    }
 }
 
 export function changeCss(className, classValue, classRepeat) {
@@ -1238,4 +1242,4 @@ export function getPostTerm(post) {
 
 export function isFeatureEnabled(feature) {
     return PreferenceStore.getPreference(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, Constants.FeatureTogglePrefix + feature.label, {value: 'false'}).value === 'true';
-}
\ No newline at end of file
+}