diff --git a/app/src/config/bazaar.ts b/app/src/config/bazaar.ts index 4fb153c32..a60da9813 100644 --- a/app/src/config/bazaar.ts +++ b/app/src/config/bazaar.ts @@ -234,10 +234,10 @@ export const bazaar = { if (!funding) { return ""; } - const isLink = funding.startsWith("http://") || funding.startsWith("https://"); - if (isLink) { + try { + new URL(funding); return ``; - } else { + } catch (e) { return ``; } }, @@ -284,7 +284,8 @@ export const bazaar = { ${item.downloads} - ${item.preferredFunding ? `${bazaar._genFundingHTML(item.preferredFunding)}` : ""} + ${bazaar._genFundingHTML(item.preferredFunding)} +
@@ -321,7 +322,7 @@ export const bazaar = {
${item.incompatible ? `${window.siyuan.languages.incompatible}` : ""} - ${item.preferredFunding ? bazaar._genFundingHTML(item.preferredFunding) : ""} + ${bazaar._genFundingHTML(item.preferredFunding)} @@ -430,7 +431,7 @@ export const bazaar = {
${item.incompatible ? `${window.siyuan.languages.incompatible}` : ""} - ${item.preferredFunding ? bazaar._genFundingHTML(item.preferredFunding) : ""} + ${bazaar._genFundingHTML(item.preferredFunding)} @@ -520,7 +521,7 @@ export const bazaar = { ${data.preferredFunding ? bazaar._genFundingHTML(data.preferredFunding) : - `` + `` } ${data.author} @@ -630,9 +631,8 @@ export const bazaar = { if (target.tagName === "A") { break; } - const copyFundingElement = hasClosestByAttribute(target, "data-type", "copy-funding"); - if (copyFundingElement) { - const funding = copyFundingElement.getAttribute("data-funding"); + if (type === "copy-funding") { + const funding = target.getAttribute("data-funding"); if (funding) { writeText(funding); showMessage(window.siyuan.languages.copied); diff --git a/app/src/protyle/util/compatibility.ts b/app/src/protyle/util/compatibility.ts index e3ad8d162..97d150b41 100644 --- a/app/src/protyle/util/compatibility.ts +++ b/app/src/protyle/util/compatibility.ts @@ -240,7 +240,7 @@ export const writeText = (text: string) => { } }; -export const copyPlainText = async (text: string) => { +export const copyPlainText = (text: string) => { text = text.replace(new RegExp(Constants.ZWSP, "g"), ""); // `复制纯文本` 时移除所有零宽空格 https://github.com/siyuan-note/siyuan/issues/6674 writeText(text); };