Skip to content

armgit / dashy

Public Imported from GitHub
0

πŸš€ A self-hostable personal dashboard built for you. Includes status-checking, widgets, themes, icon packs, a UI editor and tons more!

πŸ”’ Allows disabling of Font-Awesome (#521)

Alicia Sykesf7a8395f4a1f
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() {