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

0.24.0.dev-rc6

Browse Source
This commit is contained in:
vorotamoroz
2024-10-22 10:08:20 +01:00
parent 6d244a6e34
commit 5b4ae37030
5 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/features/HiddenFileCommon/JsonResolveModal.ts
View File

@@ -32,9 +32,12 @@ export class JsonResolveModal extends Modal {
this.hideLocal = hideLocal ?? false;
void waitForSignal(`cancel-internal-conflict:${filename}`).then(() => this.close());
}
async UICallback(keepRev?: string, mergedStr?: string) {
if (this.callback) {
await this.callback(keepRev, mergedStr);
}
this.close();
await this.callback?.(keepRev, mergedStr);
this.callback = undefined;
}