public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-10-14 13:22:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add diff-only view button to document history

Browse Source
This commit is contained in:
SeleiXi
2026-05-11 23:53:07 +08:00
parent b6b153c0de
commit 429a3ff1fd
1 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/features/DocumentHistory/DocumentHistoryModal.ts
+37 -1
View File
@@ -56,6 +56,7 @@ export class DocumentHistoryModal extends Modal {
info!: HTMLDivElement; info!: HTMLDivElement;
fileInfo!: HTMLDivElement; fileInfo!: HTMLDivElement;
showDiff = false; showDiff = false;
diffOnly = false;
id?: DocumentID; id?: DocumentID;
file: FilePathWithPrefix; file: FilePathWithPrefix;
@@ -70,6 +71,7 @@ export class DocumentHistoryModal extends Modal {
currentDiffIndex = -1; currentDiffIndex = -1;
diffNavContainer!: HTMLDivElement; diffNavContainer!: HTMLDivElement;
diffNavIndicator!: HTMLSpanElement; diffNavIndicator!: HTMLSpanElement;
diffOnlyLabel!: HTMLLabelElement;
constructor( constructor(
app: App, app: App,
@@ -91,6 +93,9 @@ export class DocumentHistoryModal extends Modal {
if (localStorage.getItem("ols-history-highlightdiff") == "1") { if (localStorage.getItem("ols-history-highlightdiff") == "1") {
this.showDiff = true; this.showDiff = true;
} }
if (localStorage.getItem("ols-history-diffonly") == "1") {
this.diffOnly = true;
}
} }
async loadFile(initialRev?: string) { async loadFile(initialRev?: string) {
@@ -173,15 +178,25 @@ export class DocumentHistoryModal extends Modal {
const w2data = readDocument(w2) as string; const w2data = readDocument(w2) as string;
const diff = dmp.diff_main(w2data, w1data); const diff = dmp.diff_main(w2data, w1data);
dmp.diff_cleanupSemantic(diff); dmp.diff_cleanupSemantic(diff);
let hasOmitted = false;
for (const v of diff) { for (const v of diff) {
const x1 = v[0]; const x1 = v[0];
const x2 = v[1]; const x2 = v[1];
if (x1 == DIFF_DELETE) { if (x1 == DIFF_DELETE) {
result += "<span class='history-deleted'>" + escapeStringToHTML(x2) + "</span>"; result += "<span class='history-deleted'>" + escapeStringToHTML(x2) + "</span>";
hasOmitted = false;
} else if (x1 == DIFF_EQUAL) { } else if (x1 == DIFF_EQUAL) {
result += "<span class='history-normal'>" + escapeStringToHTML(x2) + "</span>"; if (!this.diffOnly) {
result += "<span class='history-normal'>" + escapeStringToHTML(x2) + "</span>";
} else {
if (!hasOmitted) {
result += "\n...\n";
hasOmitted = true;
}
}
} else if (x1 == DIFF_INSERT) { } else if (x1 == DIFF_INSERT) {
result += "<span class='history-added'>" + escapeStringToHTML(x2) + "</span>"; result += "<span class='history-added'>" + escapeStringToHTML(x2) + "</span>";
hasOmitted = false;
} }
} }
result = result.replace(/\n/g, "<br>"); result = result.replace(/\n/g, "<br>");
@@ -279,6 +294,9 @@ export class DocumentHistoryModal extends Modal {
if (this.diffNavContainer) { if (this.diffNavContainer) {
this.diffNavContainer.style.display = this.showDiff ? "flex" : "none"; this.diffNavContainer.style.display = this.showDiff ? "flex" : "none";
} }
if (this.diffOnlyLabel) {
this.diffOnlyLabel.style.display = this.showDiff ? "inline-block" : "none";
}
} }
override onOpen() { override onOpen() {
@@ -320,6 +338,24 @@ export class DocumentHistoryModal extends Modal {
label.appendText("Highlight diff"); label.appendText("Highlight diff");
}); });
const diffOnlyLabel = diffOptionsRow.createEl("label", {});
diffOnlyLabel.appendChild(
createEl("input", { type: "checkbox" }, (checkbox) => {
if (this.diffOnly) {
checkbox.checked = true;
}
checkbox.addEventListener("input", (evt: any) => {
this.diffOnly = checkbox.checked;
localStorage.setItem("ols-history-diffonly", this.diffOnly == true ? "1" : "");
void scheduleOnceIfDuplicated("loadRevs", () => this.loadRevs());
});
})
);
diffOnlyLabel.appendText("Diff only");
diffOnlyLabel.style.marginLeft = "10px";
diffOnlyLabel.style.display = this.showDiff ? "inline-block" : "none";
this.diffOnlyLabel = diffOnlyLabel;
// Diff navigation buttons // Diff navigation buttons
this.diffNavContainer = diffOptionsRow.createDiv(""); this.diffNavContainer = diffOptionsRow.createDiv("");
this.diffNavContainer.addClass("diff-nav"); this.diffNavContainer.addClass("diff-nav");