mirror of
https://github.com/anareaty/html-checkboxes.git
synced 2026-07-22 05:37:43 +00:00
required fixes
This commit is contained in:
parent
adfbe61f94
commit
58b7b0659d
2 changed files with 89 additions and 103 deletions
190
main.ts
190
main.ts
|
|
@ -1,8 +1,8 @@
|
||||||
import { Editor, Plugin, TFile, Menu } from 'obsidian';
|
import { Editor, Plugin, TFile, Menu, WorkspaceLeaf } from 'obsidian';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export default class MyPlugin extends Plugin {
|
export default class HTMLCheckboxPlugin extends Plugin {
|
||||||
|
|
||||||
|
|
||||||
async onload() {
|
async onload() {
|
||||||
|
|
@ -20,8 +20,6 @@ export default class MyPlugin extends Plugin {
|
||||||
});
|
});
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
this.addCommand({
|
this.addCommand({
|
||||||
id: "add-html-checkbox",
|
id: "add-html-checkbox",
|
||||||
name: "Add HTML checkbox",
|
name: "Add HTML checkbox",
|
||||||
|
|
@ -39,63 +37,64 @@ export default class MyPlugin extends Plugin {
|
||||||
this.registerDomEvent(window, 'click', async (e: MouseEvent) => {
|
this.registerDomEvent(window, 'click', async (e: MouseEvent) => {
|
||||||
let target = e.target as HTMLElement
|
let target = e.target as HTMLElement
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (target.localName == "input" &&
|
if (target.localName == "input" &&
|
||||||
(target as HTMLInputElement).type == "checkbox" &&
|
(target as HTMLInputElement).type == "checkbox" &&
|
||||||
target.id
|
target.id
|
||||||
) {
|
) {
|
||||||
|
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
let file = this.app.workspace.getActiveFile() as TFile
|
let file = this.app.workspace.getActiveFile()
|
||||||
|
|
||||||
/* Check if checkbox is inside embedded file */
|
/* Check if checkbox is inside embedded file */
|
||||||
let embedWrapper = target.closest(".internal-embed")
|
let embedWrapper = target.closest(".internal-embed")
|
||||||
|
|
||||||
if (embedWrapper) {
|
if (embedWrapper) {
|
||||||
let embedSrc = embedWrapper.getAttribute("src") || ""
|
let embedSrc = embedWrapper.getAttribute("src") || ""
|
||||||
file = this.app.metadataCache.getFirstLinkpathDest(embedSrc, "") as TFile
|
file = this.app.metadataCache.getFirstLinkpathDest(embedSrc, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
let content = await this.app.vault.cachedRead(file)
|
if (file instanceof TFile) {
|
||||||
|
let content = await this.app.vault.cachedRead(file)
|
||||||
|
|
||||||
let id = target.id
|
let id = target.id
|
||||||
let checkboxRE = new RegExp("<input[^>]*?id=\"" + id + "\"[^>]*?>")
|
let checkboxRE = new RegExp("<input[^>]*?id=\"" + id + "\"[^>]*?>")
|
||||||
|
|
||||||
if (file.extension == "canvas") {
|
if (file.extension == "canvas") {
|
||||||
checkboxRE = new RegExp("<input[^>]*?id=\\\\\"" + id + "\\\\\"[^>]*?>")
|
checkboxRE = new RegExp("<input[^>]*?id=\\\\\"" + id + "\\\\\"[^>]*?>")
|
||||||
}
|
}
|
||||||
|
|
||||||
let checkboxMatch = content.match(checkboxRE)
|
let checkboxMatch = content.match(checkboxRE)
|
||||||
|
|
||||||
if (checkboxMatch) {
|
if (checkboxMatch) {
|
||||||
let checkboxString = checkboxMatch[0]
|
let checkboxString = checkboxMatch[0]
|
||||||
let dataTaskMatch = checkboxString.match(/data-task="."/)
|
let dataTaskMatch = checkboxString.match(/data-task="."/)
|
||||||
|
|
||||||
let newCheckboxString = checkboxString
|
let newCheckboxString = checkboxString
|
||||||
|
|
||||||
if ((target as HTMLInputElement).checked) {
|
if ((target as HTMLInputElement).checked) {
|
||||||
newCheckboxString = newCheckboxString.replace(">", " checked>")
|
newCheckboxString = newCheckboxString.replace(">", " checked>")
|
||||||
} else {
|
} else {
|
||||||
newCheckboxString = newCheckboxString.replace(" checked>", ">").replace(" >", ">")
|
newCheckboxString = newCheckboxString.replace(" checked>", ">").replace(" >", ">")
|
||||||
|
|
||||||
if (dataTaskMatch) {
|
if (dataTaskMatch) {
|
||||||
newCheckboxString = newCheckboxString.replace(dataTaskMatch[0], "")
|
newCheckboxString = newCheckboxString.replace(dataTaskMatch[0], "")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let newContent = content.replace(checkboxString, newCheckboxString)
|
||||||
|
await this.app.vault.modify(file, newContent)
|
||||||
|
|
||||||
|
let inCanvas = target.closest(".canvas-node-content")
|
||||||
|
|
||||||
|
if (file.extension != "canvas" && inCanvas) {
|
||||||
|
let leaf = this.app.workspace.getMostRecentLeaf()
|
||||||
|
if (leaf instanceof WorkspaceLeaf) {
|
||||||
|
//@ts-ignore
|
||||||
|
await leaf.rebuildView()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
let newContent = content.replace(checkboxString, newCheckboxString)
|
|
||||||
await this.app.vault.modify(file, newContent)
|
|
||||||
|
|
||||||
let inCanvas = target.closest(".canvas-node-content")
|
|
||||||
|
|
||||||
if (file.extension != "canvas" && inCanvas) {
|
|
||||||
//@ts-ignore
|
|
||||||
await this.app.workspace.getMostRecentLeaf().rebuildView()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -160,9 +159,9 @@ export default class MyPlugin extends Plugin {
|
||||||
);
|
);
|
||||||
|
|
||||||
menu.showAtMouseEvent(e as MouseEvent);
|
menu.showAtMouseEvent(e as MouseEvent);
|
||||||
|
console.log(menu)
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
menu.dom.classList.add("checkbox-menu");
|
menu.dom.classList.add("checkbox-menu");
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
@ -205,82 +204,69 @@ export default class MyPlugin extends Plugin {
|
||||||
|
|
||||||
|
|
||||||
async setStatus(status: string, target: HTMLElement) {
|
async setStatus(status: string, target: HTMLElement) {
|
||||||
let file = this.app.workspace.getActiveFile() as TFile
|
let file = this.app.workspace.getActiveFile()
|
||||||
|
|
||||||
/* Check if checkbox is inside embedded file */
|
/* Check if checkbox is inside embedded file */
|
||||||
let embedWrapper = target.closest(".internal-embed")
|
let embedWrapper = target.closest(".internal-embed")
|
||||||
|
|
||||||
if (embedWrapper) {
|
if (embedWrapper) {
|
||||||
let embedSrc = embedWrapper.getAttribute("src") || ""
|
let embedSrc = embedWrapper.getAttribute("src") || ""
|
||||||
file = this.app.metadataCache.getFirstLinkpathDest(embedSrc, "") as TFile
|
file = this.app.metadataCache.getFirstLinkpathDest(embedSrc, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
let content = await this.app.vault.cachedRead(file)
|
if (file instanceof TFile) {
|
||||||
|
let content = await this.app.vault.cachedRead(file)
|
||||||
|
let id = target.id
|
||||||
|
let checkboxRE = new RegExp("<input[^>]*?id=\"" + id + "\"[^>]*?>")
|
||||||
|
|
||||||
let id = target.id
|
if (file.extension == "canvas") {
|
||||||
let checkboxRE = new RegExp("<input[^>]*?id=\"" + id + "\"[^>]*?>")
|
checkboxRE = new RegExp("<input[^>]*?id=\\\\\"" + id + "\\\\\"[^>]*?>")
|
||||||
|
|
||||||
if (file.extension == "canvas") {
|
|
||||||
checkboxRE = new RegExp("<input[^>]*?id=\\\\\"" + id + "\\\\\"[^>]*?>")
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
let checkboxString = content.match(checkboxRE)![0]
|
|
||||||
let newCheckboxString = checkboxString
|
|
||||||
let statusRe = new RegExp("data-task=\"" + status + "\"")
|
|
||||||
|
|
||||||
let dataTaskMatch = checkboxString.match(/data-task="."/)
|
|
||||||
|
|
||||||
|
|
||||||
if (file.extension == "canvas") {
|
|
||||||
dataTaskMatch = checkboxString.match(/data-task=\\".\\"/)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
let dataTaskMatchFirst = ""
|
|
||||||
if (dataTaskMatch) {
|
|
||||||
dataTaskMatchFirst = dataTaskMatch[0]
|
|
||||||
}
|
|
||||||
|
|
||||||
let statusMatch = checkboxString.match(statusRe)
|
|
||||||
|
|
||||||
|
|
||||||
let dataTaskString = "data-task=\"" + status + "\""
|
|
||||||
|
|
||||||
if (file.extension == "canvas") {
|
|
||||||
dataTaskString = 'data-task=\\\"' + status + '\\\"'
|
|
||||||
}
|
|
||||||
|
|
||||||
if (status == " ") {
|
|
||||||
newCheckboxString = newCheckboxString
|
|
||||||
.replace(dataTaskMatchFirst, "")
|
|
||||||
.replace(" checked>", ">").replace(" >", ">")
|
|
||||||
} else {
|
|
||||||
|
|
||||||
if (dataTaskMatch && !statusMatch) {
|
|
||||||
newCheckboxString = newCheckboxString.replace(dataTaskMatchFirst, dataTaskString)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!dataTaskMatch && (target as HTMLInputElement).checked) {
|
let checkboxString = content.match(checkboxRE)![0]
|
||||||
newCheckboxString = newCheckboxString.replace("checked", dataTaskString + " checked")
|
let newCheckboxString = checkboxString
|
||||||
}
|
let statusRe = new RegExp("data-task=\"" + status + "\"")
|
||||||
|
let dataTaskMatch = checkboxString.match(/data-task="."/)
|
||||||
if (!dataTaskMatch && !(target as HTMLInputElement).checked) {
|
|
||||||
newCheckboxString = newCheckboxString.replace(">", " " + dataTaskString + " checked>")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let newContent = content.replace(checkboxString, newCheckboxString)
|
if (file.extension == "canvas") {
|
||||||
await this.app.vault.modify(file, newContent)
|
dataTaskMatch = checkboxString.match(/data-task=\\".\\"/)
|
||||||
|
}
|
||||||
|
|
||||||
|
let dataTaskMatchFirst = ""
|
||||||
|
if (dataTaskMatch) {
|
||||||
|
dataTaskMatchFirst = dataTaskMatch[0]
|
||||||
|
}
|
||||||
|
|
||||||
|
let statusMatch = checkboxString.match(statusRe)
|
||||||
|
let dataTaskString = "data-task=\"" + status + "\""
|
||||||
|
|
||||||
|
if (file.extension == "canvas") {
|
||||||
|
dataTaskString = 'data-task=\\\"' + status + '\\\"'
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status == " ") {
|
||||||
|
newCheckboxString = newCheckboxString
|
||||||
|
.replace(dataTaskMatchFirst, "")
|
||||||
|
.replace(" checked>", ">").replace(" >", ">")
|
||||||
|
} else {
|
||||||
|
|
||||||
|
if (dataTaskMatch && !statusMatch) {
|
||||||
|
newCheckboxString = newCheckboxString.replace(dataTaskMatchFirst, dataTaskString)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!dataTaskMatch && (target as HTMLInputElement).checked) {
|
||||||
|
newCheckboxString = newCheckboxString.replace("checked", dataTaskString + " checked")
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!dataTaskMatch && !(target as HTMLInputElement).checked) {
|
||||||
|
newCheckboxString = newCheckboxString.replace(">", " " + dataTaskString + " checked>")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let newContent = content.replace(checkboxString, newCheckboxString)
|
||||||
|
await this.app.vault.modify(file, newContent)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"id": "html-checkboxes",
|
"id": "html-checkboxes",
|
||||||
"name": "HTML checkboxes",
|
"name": "HTML checkboxes",
|
||||||
"version": "1.0.0",
|
"version": "1.0.1",
|
||||||
"minAppVersion": "0.15.0",
|
"minAppVersion": "0.15.0",
|
||||||
"description": "Allows to quickly add HTML checkboxes to your notes and makes them clickable.",
|
"description": "Allows to quickly add HTML checkboxes to your notes and makes them clickable.",
|
||||||
"author": "Anareaty",
|
"author": "Anareaty",
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue