public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2025-12-13 17:55:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed:

Browse Source 
- Fixed merging issues.
- Fixed button styling.

Changed:
- Default behaviour of conflict checking on synchronising.
This commit is contained in:
vorotamoroz
2022-12-26 16:12:57 +09:00
parent 34c1b040db
commit fc3617d9f9
4 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ObsidianLiveSyncSettingTab.ts
View File

@@ -412,7 +412,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
.setButtonText("Apply") .setButtonText("Apply")
.setWarning() .setWarning()
.setDisabled(false) .setDisabled(false)
.setClass("sls-btn-right")
.onClick(async () => { .onClick(async () => {
await applyEncryption(true); await applyEncryption(true);
}) })
@@ -422,7 +421,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
.setButtonText("Apply w/o rebuilding") .setButtonText("Apply w/o rebuilding")
.setWarning() .setWarning()
.setDisabled(false) .setDisabled(false)
.setClass("sls-btn-right")
.onClick(async () => { .onClick(async () => {
await applyEncryption(false); await applyEncryption(false);
}) })
@@ -470,7 +468,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
.setButtonText("Send") .setButtonText("Send")
.setWarning() .setWarning()
.setDisabled(false) .setDisabled(false)
.setClass("sls-btn-left")
.onClick(async () => { .onClick(async () => {
await rebuildDB("remoteOnly"); await rebuildDB("remoteOnly");
}) })
@@ -485,7 +482,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
.setButtonText("Rebuild") .setButtonText("Rebuild")
.setWarning() .setWarning()
.setDisabled(false) .setDisabled(false)
.setClass("sls-btn-left")
.onClick(async () => { .onClick(async () => {
await rebuildDB("rebuildBothByThisDevice"); await rebuildDB("rebuildBothByThisDevice");
}) })
@@ -760,7 +756,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
.setButtonText("Fetch") .setButtonText("Fetch")
.setWarning() .setWarning()
.setDisabled(false) .setDisabled(false)
.setClass("sls-btn-left")
.onClick(async () => { .onClick(async () => {
await rebuildDB("localOnly"); await rebuildDB("localOnly");
}) })
@@ -1103,7 +1098,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
.setButtonText("Touch") .setButtonText("Touch")
.setWarning() .setWarning()
.setDisabled(false) .setDisabled(false)
.setClass("sls-btn-left")
.onClick(async () => { .onClick(async () => {
const filesAll = await this.plugin.scanInternalFiles(); const filesAll = await this.plugin.scanInternalFiles();
const targetFiles = await this.plugin.filterTargetFiles(filesAll); const targetFiles = await this.plugin.filterTargetFiles(filesAll);

2
src/lib

Submodule src/lib updated: 9fe5ce421f...bfad1f86d3

2
src/main.ts
View File

@@ -2176,7 +2176,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
const conflictedRevNo = Number(conflictedRev.split("-")[0]); const conflictedRevNo = Number(conflictedRev.split("-")[0]);
//Search //Search
const revFrom = (await this.localDatabase.localDatabase.get(id2path(path), { revs_info: true })) as unknown as LoadedEntry & PouchDB.Core.GetMeta; const revFrom = (await this.localDatabase.localDatabase.get(id2path(path), { revs_info: true })) as unknown as LoadedEntry & PouchDB.Core.GetMeta;
const commonBase = revFrom._revs_info.filter(e => e.status == "available" && Number(e.rev.split("-")[0]) < conflictedRevNo).first().rev ?? ""; const commonBase = revFrom._revs_info.filter(e => e.status == "available" && Number(e.rev.split("-")[0]) < conflictedRevNo).first()?.rev ?? "";
let p = undefined; let p = undefined;
if (commonBase) { if (commonBase) {
if (isSensibleMargeApplicable(path)) { if (isSensibleMargeApplicable(path)) {

7
styles.css
View File

@@ -85,13 +85,6 @@
} */ } */
.sls-btn-left {
padding-right: 4px;
}
.sls-btn-right {
padding-left: 4px;
}
.sls-header-button { .sls-header-button {
margin-left: 2em; margin-left: 2em;