diff --git a/app/src/block/popover.ts b/app/src/block/popover.ts index fddcb84d2..a8355f5ee 100644 --- a/app/src/block/popover.ts +++ b/app/src/block/popover.ts @@ -16,9 +16,7 @@ export const initBlockPopover = (app: App) => { } const aElement = hasClosestByAttribute(event.target, "data-type", "a", true) || hasClosestByAttribute(event.target, "data-type", "tab-header") || - hasClosestByClassName(event.target, "av__gutters") || - hasClosestByClassName(event.target, "emojis__item") || - hasClosestByClassName(event.target, "emojis__type") || + hasClosestByClassName(event.target, "ariaLabel") || hasClosestByAttribute(event.target, "data-type", "inline-memo"); if (aElement) { let tip = aElement.getAttribute("aria-label") || aElement.getAttribute("data-inline-memo-content"); diff --git a/app/src/dialog/tooltip.ts b/app/src/dialog/tooltip.ts index e22797dc7..6069b77d2 100644 --- a/app/src/dialog/tooltip.ts +++ b/app/src/dialog/tooltip.ts @@ -17,6 +17,10 @@ export const showTooltip = (message: string, target: Element, error = false) => } else { messageElement.innerHTML = message; } + if (target.getAttribute("data-type") === "navigation-file") { + setPosition(messageElement, targetRect.right, targetRect.top); + return; + } if (error) { messageElement.classList.add("tooltip--error"); } else { diff --git a/app/src/emoji/index.ts b/app/src/emoji/index.ts index f9b8c4a23..61d9d008f 100644 --- a/app/src/emoji/index.ts +++ b/app/src/emoji/index.ts @@ -51,7 +51,7 @@ export const lazyLoadEmoji = (element: HTMLElement) => { if ((typeof entrie.isIntersecting === "undefined" ? entrie.intersectionRatio !== 0 : entrie.isIntersecting) && index) { let html = ""; window.siyuan.emojis[parseInt(index)].items.forEach(emoji => { - html += ``; }); entrie.target.innerHTML = html; @@ -119,7 +119,7 @@ export const filterEmoji = (key = "", max?: number) => { if (category.id === "custom") { customStore.push(emoji); } else { - keyHTML += ``; } maxCount++; @@ -129,7 +129,7 @@ ${unicode2Emoji(emoji.unicode, undefined, false, true)}`; recentEmojis.push(emoji); } if (index < 2) { - html += ``; } } @@ -154,7 +154,7 @@ ${unicode2Emoji(emoji.unicode, undefined, false, true)}`; } return 0; }).forEach(item => { - html += ``; }); html = html + keyHTML + ""; @@ -165,7 +165,7 @@ ${unicode2Emoji(item.unicode, undefined, false, true)}`; window.siyuan.config.editor.emoji.forEach(emojiUnicode => { const emoji = recentEmojis.filter((item) => item.unicode === emojiUnicode); if (emoji[0]) { - recentHTML += ``; } @@ -206,16 +206,16 @@ export const openEmojiPanel = (id: string, target: HTMLElement, isNotebook = fal
${filterEmoji()}
-
${unicode2Emoji("2b50")}
-
${unicode2Emoji("1f527")}
-
${unicode2Emoji("1f60d")}
-
${unicode2Emoji("1f433")}
-
${unicode2Emoji("1f96a")}
-
${unicode2Emoji("1f3a8")}
-
${unicode2Emoji("1f3dd")}
-
${unicode2Emoji("1f52e")}
-
${unicode2Emoji("267e")}
-
${unicode2Emoji("1f6a9")}
+
${unicode2Emoji("2b50")}
+
${unicode2Emoji("1f527")}
+
${unicode2Emoji("1f60d")}
+
${unicode2Emoji("1f433")}
+
${unicode2Emoji("1f96a")}
+
${unicode2Emoji("1f3a8")}
+
${unicode2Emoji("1f3dd")}
+
${unicode2Emoji("1f52e")}
+
${unicode2Emoji("267e")}
+
${unicode2Emoji("1f6a9")}
`; window.siyuan.menus.menu.element.querySelector(".emojis__item").classList.add("emojis__item--current"); @@ -343,7 +343,7 @@ export const openEmojiPanel = (id: string, target: HTMLElement, isNotebook = fal if (index) { let html = ""; window.siyuan.emojis[parseInt(index)].items.forEach(emoji => { - html += ``; }); titleElement.nextElementSibling.innerHTML = html; diff --git a/app/src/layout/dock/Files.ts b/app/src/layout/dock/Files.ts index fc1a39b9d..fd356ded6 100644 --- a/app/src/layout/dock/Files.ts +++ b/app/src/layout/dock/Files.ts @@ -984,10 +984,10 @@ export class Files extends Model { if (item.count && item.count > 0) { countHTML = `${item.count}`; } - return `
  • " + window.siyuan.languages.bookmark + " " + item.bookmark : ""}${item.name1 ? "
    " + window.siyuan.languages.name + " " + item.name1 : ""}${item.alias ? "
    " + window.siyuan.languages.alias + " " + item.alias : ""}${item.memo ? "
    " + window.siyuan.languages.memo + " " + item.memo : ""}${item.subFileCount !== 0 ? window.siyuan.languages.includeSubFile.replace("x", item.subFileCount) : ""}
    ${window.siyuan.languages.modifiedAt} ${item.hMtime}
    ${window.siyuan.languages.createdAt} ${item.hCtime}" data-node-id="${item.id}" data-name="${Lute.EscapeHTMLStr(item.name)}" draggable="true" data-count="${item.subFileCount}" data-type="navigation-file" -class="b3-list-item b3-list-item--hide-action" data-path="${item.path}"> +class="b3-list-item b3-list-item--hide-action ariaLabel" data-path="${item.path}"> diff --git a/app/src/protyle/hint/index.ts b/app/src/protyle/hint/index.ts index 58552d995..7c2d48396 100644 --- a/app/src/protyle/hint/index.ts +++ b/app/src/protyle/hint/index.ts @@ -80,7 +80,7 @@ export class Hint { if (index) { let html = ""; window.siyuan.emojis[parseInt(index)].items.forEach(emoji => { - html += ``; }); titleElement.nextElementSibling.innerHTML = html; @@ -392,16 +392,16 @@ ${unicode2Emoji(emoji.unicode)}`; this.element.innerHTML = `
    ${filterEmoji(value, 256)}
    - - - - - - - - - - + + + + + + + + + +
    `; lazyLoadEmoji(this.element); diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts index eedc4fb0c..b89d71fa9 100644 --- a/app/src/protyle/render/av/render.ts +++ b/app/src/protyle/render/av/render.ts @@ -46,7 +46,7 @@ ${column.wrap ? "" : "white-space: nowrap;"}"> // body data.rows.forEach((row: IAVRow) => { tableHTML += `
    -
    +
    `;