mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-04-05 08:35:19 +00:00
- `Sync on Editor save` has been implemented - Now we can use the `Hidden file sync` and the `Customization sync` cooperatively. - We can ignore specific plugins in Customization sync. - Now the message of leftover conflicted files accepts our click. Refactored: - Parallelism functions made more explicit. - Type errors have been reduced. Fixed: - Now documents would not be overwritten if they are conflicted. - Some error messages have been fixed. - Missing dialogue titles have been shown now.
65 lines
2.0 KiB
TypeScript
65 lines
2.0 KiB
TypeScript
import { App, Modal } from "./deps";
|
|
import { type FilePath, type LoadedEntry } from "./lib/src/types";
|
|
import JsonResolvePane from "./JsonResolvePane.svelte";
|
|
|
|
export class JsonResolveModal extends Modal {
|
|
// result: Array<[number, string]>;
|
|
filename: FilePath;
|
|
callback: (keepRev: string, mergedStr?: string) => Promise<void>;
|
|
docs: LoadedEntry[];
|
|
component: JsonResolvePane;
|
|
nameA: string;
|
|
nameB: string;
|
|
defaultSelect: string;
|
|
|
|
constructor(app: App, filename: FilePath, docs: LoadedEntry[], callback: (keepRev: string, mergedStr?: string) => Promise<void>, nameA?: string, nameB?: string, defaultSelect?: string) {
|
|
super(app);
|
|
this.callback = callback;
|
|
this.filename = filename;
|
|
this.docs = docs;
|
|
this.nameA = nameA;
|
|
this.nameB = nameB;
|
|
this.defaultSelect = defaultSelect;
|
|
}
|
|
async UICallback(keepRev: string, mergedStr?: string) {
|
|
this.close();
|
|
await this.callback(keepRev, mergedStr);
|
|
this.callback = null;
|
|
}
|
|
|
|
onOpen() {
|
|
const { contentEl } = this;
|
|
this.titleEl.setText("Conflicted Setting");
|
|
contentEl.empty();
|
|
|
|
if (this.component == null) {
|
|
this.component = new JsonResolvePane({
|
|
target: contentEl,
|
|
props: {
|
|
docs: this.docs,
|
|
filename: this.filename,
|
|
nameA: this.nameA,
|
|
nameB: this.nameB,
|
|
defaultSelect: this.defaultSelect,
|
|
callback: (keepRev: string, mergedStr: string) => this.UICallback(keepRev, mergedStr),
|
|
},
|
|
});
|
|
}
|
|
return;
|
|
}
|
|
|
|
|
|
onClose() {
|
|
const { contentEl } = this;
|
|
contentEl.empty();
|
|
// contentEl.empty();
|
|
if (this.callback != null) {
|
|
this.callback(null);
|
|
}
|
|
if (this.component != null) {
|
|
this.component.$destroy();
|
|
this.component = null;
|
|
}
|
|
}
|
|
}
|