mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-05-12 02:31:51 +00:00
Fixed:
- Now we *surely* can set the device name and enable customised synchronisation. - Unnecessary dialogue update processes have been eliminated. - Customisation sync no longer stores half-collected files. - No longer hangs up when removing or renaming files with the `Sync on Save` toggle enabled. Improved: - Customisation sync now performs data deserialization more smoothly. - New translations have been merged.
This commit is contained in:
@@ -439,6 +439,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
|
||||
}
|
||||
if (key == "deviceAndVaultName") {
|
||||
this.plugin.deviceAndVaultName = this.editingSettings?.[key];
|
||||
this.plugin.saveDeviceAndVaultName();
|
||||
return await Promise.resolve();
|
||||
}
|
||||
}
|
||||
@@ -519,12 +520,12 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
|
||||
/**
|
||||
* Reread all settings and request invalidate
|
||||
*/
|
||||
reloadAllSettings() {
|
||||
reloadAllSettings(skipUpdate: boolean = false) {
|
||||
const localSetting = this.reloadAllLocalSettings();
|
||||
this._editingSettings = { ...this.plugin.settings, ...localSetting };
|
||||
this._editingSettings = { ...this.editingSettings, ...this.computeAllLocalSettings() };
|
||||
this.initialSettings = { ...this.editingSettings, };
|
||||
this.requestUpdate();
|
||||
if (!skipUpdate) this.requestUpdate();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -667,9 +668,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
|
||||
this.requestUpdate();
|
||||
}
|
||||
} else {
|
||||
Logger(`reread: all! hidden`, LOG_LEVEL_VERBOSE)
|
||||
this.reloadAllSettings();
|
||||
this.display();
|
||||
this.reloadAllSettings(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user