yonote/yjs
14
0
Fork 0
Code Pull Requests 1 Releases Activity

rename transaction._replacedItems to transaction._mergeStructs

Browse Source
This commit is contained in:
Kevin Jahns
2019-04-11 00:31:43 +02:00
parent 9c29d820c8
commit 759ecb21f7
5 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/utils/Transaction.js
View File

@@ -14,7 +14,7 @@ import {
callEventHandlerListeners,
AbstractItem,
ItemDeleted,
AbstractType, AbstractStruct, YEvent, Y // eslint-disable-line
ID, AbstractType, AbstractStruct, YEvent, Y // eslint-disable-line
} from '../internals.js'
import * as encoding from 'lib0/encoding.js'
@@ -86,9 +86,9 @@ export class Transaction {
*/
this._updateMessage = null
/**
* @type {Set<AbstractStruct>}
* @type {Set<ID>}
*/
this._replacedItems = new Set()
this._mergeStructs = new Set()
}
/**
* @type {encoding.Encoder|null}
@@ -213,12 +213,10 @@ export const transact = (y, f) => {
}
}
}
// try to merge replacedItems
// TODO: replacedItems should hold ids
for (const replacedItem of transaction._replacedItems) {
const id = replacedItem.id
const client = id.client
const clock = id.clock
// try to merge mergeStructs
for (const mid of transaction._mergeStructs) {
const client = mid.client
const clock = mid.clock
/**
* @type {Array<AbstractStruct>}
*/