mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-04-18 23:18:36 +00:00
b3a85c5462
- Now we are ready for i18n. - The setting dialogue has been refined. Very controllable, clearly displayed disabled items, and ready to i18n. Fixed: - Many memory leaks have been rescued. - Chunk caches now work well. - Many trivial but potential bugs are fixed. - No longer error messages will be shown on retrieving checkpoint or server information. - Now we can check and correct tweak mismatch during the setup Improved: - Customisation synchronisation has got more smoother. Tidied - Practically unused functions have been removed or are being prepared for removal. - Many of the type-errors and lint errors have been corrected. - Unused files have been removed. Note: - From this version, some test files have been included. However, they are not enabled and released in the release build.
67 lines
2.2 KiB
TypeScript
67 lines
2.2 KiB
TypeScript
import { App, Modal } from "../deps.ts";
|
|
import { type FilePath, type LoadedEntry } from "../lib/src/common/types.ts";
|
|
import JsonResolvePane from "./JsonResolvePane.svelte";
|
|
import { waitForSignal } from "../lib/src/common/utils.ts";
|
|
|
|
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 || "";
|
|
waitForSignal(`cancel-internal-conflict:${filename}`).then(() => this.close());
|
|
}
|
|
async UICallback(keepRev?: string, mergedStr?: string) {
|
|
this.close();
|
|
await this.callback?.(keepRev, mergedStr);
|
|
this.callback = undefined;
|
|
}
|
|
|
|
onOpen() {
|
|
const { contentEl } = this;
|
|
this.titleEl.setText("Conflicted Setting");
|
|
contentEl.empty();
|
|
|
|
if (this.component == undefined) {
|
|
this.component = new JsonResolvePane({
|
|
target: contentEl,
|
|
props: {
|
|
docs: this.docs,
|
|
filename: this.filename,
|
|
nameA: this.nameA,
|
|
nameB: this.nameB,
|
|
defaultSelect: this.defaultSelect,
|
|
callback: (keepRev, mergedStr) => this.UICallback(keepRev, mergedStr),
|
|
},
|
|
});
|
|
}
|
|
return;
|
|
}
|
|
|
|
|
|
onClose() {
|
|
const { contentEl } = this;
|
|
contentEl.empty();
|
|
// contentEl.empty();
|
|
if (this.callback != undefined) {
|
|
this.callback(undefined);
|
|
}
|
|
if (this.component != undefined) {
|
|
this.component.$destroy();
|
|
this.component = undefined;
|
|
}
|
|
}
|
|
}
|