From f7a8395f4a1fe62bedf082c0d73bd4efa8e0f2a1 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Wed, 2 Mar 2022 13:26:13 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=92=20Allows=20disabling=20of=20Font-A?= =?UTF-8?q?wesome=20(#521)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/HomeMixin.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mixins/HomeMixin.js b/src/mixins/HomeMixin.js index 4a0f04fd..90b66777 100644 --- a/src/mixins/HomeMixin.js +++ b/src/mixins/HomeMixin.js @@ -61,6 +61,8 @@ const HomeMixin = { }, /* Checks if any of the icons are Font Awesome glyphs */ checkIfFontAwesomeNeeded() { + if (this.appConfig.enableFontAwesome === false) return false; + if (this.appConfig.enableFontAwesome) return true; let isNeeded = this.checkIfIconLibraryNeeded('fa-'); const currentTheme = localStorage[localStorageKeys.THEME]; // Some themes require FA if (['material', 'material-dark'].includes(currentTheme)) isNeeded = true; @@ -68,7 +70,7 @@ const HomeMixin = { }, /* Injects font-awesome's script tag, only if needed */ initiateFontAwesome() { - if (this.appConfig.enableFontAwesome || this.checkIfFontAwesomeNeeded()) { + if (this.checkIfFontAwesomeNeeded()) { const fontAwesomeScript = document.createElement('script'); const faKey = this.appConfig.fontAwesomeKey || Defaults.fontAwesomeKey; fontAwesomeScript.setAttribute('src', `${iconCdns.fa}/${faKey}.js`); @@ -77,7 +79,9 @@ const HomeMixin = { }, /* Checks if any of the icons are Material Design Icons */ checkIfMdiNeeded() { - return this.checkIfIconLibraryNeeded('mdi-'); + const userOverride = this.appConfig.enableMaterialDesignIcons; + if (userOverride === false) return false; + return userOverride || this.checkIfIconLibraryNeeded('mdi-'); }, /* Injects Material Design Icons, only if needed */ initiateMaterialDesignIcons() {