Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

small refactoring

Browse Source
This commit is contained in:
zadam
2021-08-26 22:10:59 +02:00
parent d0747b125c
commit 635f5fdc5b
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/becca/becca_loader.js
View File

@@ -60,7 +60,7 @@ function postProcessEntityUpdate(entityName, entity) {
} }
} }
eventService.subscribe([eventService.ENTITY_CHANGE_SYNCED], ({entityName, entity}) => { eventService.subscribe([eventService.ENTITY_CHANGE_SYNCED], ({entityName, entityRow}) => {
if (!becca.loaded) { if (!becca.loaded) {
return; return;
} }
@@ -69,18 +69,18 @@ eventService.subscribe([eventService.ENTITY_CHANGE_SYNCED], ({entityName, entit
const EntityClass = entityConstructor.getEntityFromEntityName(entityName); const EntityClass = entityConstructor.getEntityFromEntityName(entityName);
const primaryKeyName = EntityClass.primaryKeyName; const primaryKeyName = EntityClass.primaryKeyName;
let beccaEntity = becca.getEntity(entityName, entity[primaryKeyName]); let beccaEntity = becca.getEntity(entityName, entityRow[primaryKeyName]);
if (beccaEntity) { if (beccaEntity) {
beccaEntity.updateFromRow(entity); beccaEntity.updateFromRow(entityRow);
} else { } else {
beccaEntity = new EntityClass(); beccaEntity = new EntityClass();
beccaEntity.updateFromRow(entity); beccaEntity.updateFromRow(entityRow);
beccaEntity.init(); beccaEntity.init();
} }
} }
postProcessEntityUpdate(entityName, entity); postProcessEntityUpdate(entityName, entityRow);
}); });
eventService.subscribe(eventService.ENTITY_CHANGED, ({entityName, entity}) => { eventService.subscribe(eventService.ENTITY_CHANGED, ({entityName, entity}) => {

12
src/services/sync_update.js
View File

@@ -4,9 +4,9 @@ const entityChangesService = require('./entity_changes');
const eventService = require('./events'); const eventService = require('./events');
const entityConstructor = require("../becca/entity_constructor"); const entityConstructor = require("../becca/entity_constructor");
function updateEntity(entityChange, entity) { function updateEntity(entityChange, entityRow) {
// can be undefined for options with isSynced=false // can be undefined for options with isSynced=false
if (!entity) { if (!entityRow) {
if (entityChange.isSynced) { if (entityChange.isSynced) {
if (entityChange.isErased) { if (entityChange.isErased) {
entityChangesService.addEntityChange(entityChange); entityChangesService.addEntityChange(entityChange);
@@ -23,11 +23,11 @@ function updateEntity(entityChange, entity) {
} }
const updated = entityChange.entityName === 'note_reordering' const updated = entityChange.entityName === 'note_reordering'
? updateNoteReordering(entityChange, entity) ? updateNoteReordering(entityChange, entityRow)
: updateNormalEntity(entityChange, entity); : updateNormalEntity(entityChange, entityRow);
if (updated) { if (updated) {
if (entity.isDeleted) { if (entityRow.isDeleted) {
eventService.emit(eventService.ENTITY_DELETE_SYNCED, { eventService.emit(eventService.ENTITY_DELETE_SYNCED, {
entityName: entityChange.entityName, entityName: entityChange.entityName,
entityId: entityChange.entityId entityId: entityChange.entityId
@@ -36,7 +36,7 @@ function updateEntity(entityChange, entity) {
else if (!entityChange.isErased) { else if (!entityChange.isErased) {
eventService.emit(eventService.ENTITY_CHANGE_SYNCED, { eventService.emit(eventService.ENTITY_CHANGE_SYNCED, {
entityName: entityChange.entityName, entityName: entityChange.entityName,
entity entityRow
}); });
} }
} }