From cf824af2b61c731bea3827c0169d1da714ce2573 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Fri, 14 Oct 2022 08:37:57 +0800 Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/6192 --- app/src/util/assets.ts | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/app/src/util/assets.ts b/app/src/util/assets.ts index 4be0b6493..f15c788f5 100644 --- a/app/src/util/assets.ts +++ b/app/src/util/assets.ts @@ -55,15 +55,27 @@ export const loadAssets = (data: IAppearance) => { addScript(themeScriptAddress, "themeScript"); } - const iconScriptElement = document.getElementById("iconScript"); - const iconURL = `/appearance/icons/${data.icon}/icon.js?v=${data.iconVer}`; - if (iconScriptElement) { - if (!iconScriptElement.getAttribute("src").startsWith(iconURL)) { - iconScriptElement.remove(); - addScript(iconURL, "iconScript"); + const iconDefaultScriptElement = document.getElementById("iconDefaultScript"); + const iconURL = `/appearance/icons/${["ant", "material"].includes(data.icon) ? data.icon : "material"}/icon.js?v=${data.iconVer}`; + if (iconDefaultScriptElement) { + if (!iconDefaultScriptElement.getAttribute("src").startsWith(iconURL)) { + iconDefaultScriptElement.remove(); + addScript(iconURL, "iconDefaultScript"); } } else { - addScript(iconURL, "iconScript"); + addScript(iconURL, "iconDefaultScript"); + } + if (!["ant", "material"].includes(data.icon)) { + const iconScriptElement = document.getElementById("iconScript"); + const iconURL = `/appearance/icons/${data.icon}/icon.js?v=${data.iconVer}`; + if (iconScriptElement) { + if (!iconScriptElement.getAttribute("src").startsWith(iconURL)) { + iconScriptElement.remove(); + addScript(iconURL, "iconScript"); + } + } else { + addScript(iconURL, "iconScript"); + } } };