public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-01-24 14:07:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed:

Browse Source 
- Now the filename is shown on the Conflict resolving dialog
- Rename of files has been improved again.
This commit is contained in:
vorotamoroz
2023-01-19 13:11:30 +09:00
parent bc158e9f2b
commit ef57fbfdda
4 changed files with 147 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ConflictResolveModal.ts
View File

@@ -6,12 +6,14 @@ import { escapeStringToHTML } from "./lib/src/strbin";
export class ConflictResolveModal extends Modal {
// result: Array<[number, string]>;
result: diff_result;
filename: string;
callback: (remove_rev: string) => Promise<void>;
constructor(app: App, diff: diff_result, callback: (remove_rev: string) => Promise<void>) {
constructor(app: App, filename: string, diff: diff_result, callback: (remove_rev: string) => Promise<void>) {
super(app);
this.result = diff;
this.callback = callback;
this.filename = filename;
}
onOpen() {
@@ -20,6 +22,7 @@ export class ConflictResolveModal extends Modal {
contentEl.empty();
contentEl.createEl("h2", { text: "This document has conflicted changes." });
contentEl.createEl("span", this.filename);
const div = contentEl.createDiv("");
div.addClass("op-scrollable");
let diff = "";