fix the case that a new transaction starts in an event listener (afterTransaction, observe, observeDeep)
This commit is contained in:
@@ -12,8 +12,8 @@ class YArrayEvent extends YEvent {
|
||||
}
|
||||
|
||||
export default class YArray extends Type {
|
||||
_callObserver (parentSubs, remote) {
|
||||
this._callEventHandler(new YArrayEvent(this, remote))
|
||||
_callObserver (transaction, parentSubs, remote) {
|
||||
this._callEventHandler(transaction, new YArrayEvent(this, remote))
|
||||
}
|
||||
get (pos) {
|
||||
let n = this._start
|
||||
|
||||
@@ -13,8 +13,8 @@ class YMapEvent extends YEvent {
|
||||
}
|
||||
|
||||
export default class YMap extends Type {
|
||||
_callObserver (parentSubs, remote) {
|
||||
this._callEventHandler(new YMapEvent(this, parentSubs, remote))
|
||||
_callObserver (transaction, parentSubs, remote) {
|
||||
this._callEventHandler(transaction, new YMapEvent(this, parentSubs, remote))
|
||||
}
|
||||
toJSON () {
|
||||
const map = {}
|
||||
|
||||
@@ -142,8 +142,8 @@ export default class YXmlFragment extends YArray {
|
||||
xml.setDomFilter(f)
|
||||
})
|
||||
}
|
||||
_callObserver (parentSubs, remote) {
|
||||
this._callEventHandler(new YXmlEvent(this, parentSubs, remote))
|
||||
_callObserver (transaction, parentSubs, remote) {
|
||||
this._callEventHandler(transaction, new YXmlEvent(this, parentSubs, remote))
|
||||
}
|
||||
toString () {
|
||||
return this.map(xml => xml.toString()).join('')
|
||||
|
||||
@@ -7,7 +7,7 @@ let relativeSelection = null
|
||||
|
||||
export let beforeTransactionSelectionFixer
|
||||
if (typeof getSelection !== 'undefined') {
|
||||
beforeTransactionSelectionFixer = function _beforeTransactionSelectionFixer (y, remote) {
|
||||
beforeTransactionSelectionFixer = function _beforeTransactionSelectionFixer (y, transaction, remote) {
|
||||
if (!remote) {
|
||||
return
|
||||
}
|
||||
@@ -30,7 +30,7 @@ if (typeof getSelection !== 'undefined') {
|
||||
beforeTransactionSelectionFixer = function _fakeBeforeTransactionSelectionFixer () {}
|
||||
}
|
||||
|
||||
export function afterTransactionSelectionFixer (y, remote) {
|
||||
export function afterTransactionSelectionFixer (y, transaction, remote) {
|
||||
if (relativeSelection === null || !remote) {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -138,8 +138,13 @@ export function applyChangesFromDom (dom) {
|
||||
export function reflectChangesOnDom (events) {
|
||||
// Make sure that no filtered attributes are applied to the structure
|
||||
// if they were, delete them
|
||||
/*
|
||||
events.forEach(event => {
|
||||
const target = event.target
|
||||
if (event.attributesChanged === undefined) {
|
||||
// event.target is Y.XmlText
|
||||
return
|
||||
}
|
||||
const keys = this._domFilter(target.nodeName, Array.from(event.attributesChanged))
|
||||
if (keys === null) {
|
||||
target._delete()
|
||||
@@ -156,6 +161,7 @@ export function reflectChangesOnDom (events) {
|
||||
})
|
||||
}
|
||||
})
|
||||
*/
|
||||
this._mutualExclude(() => {
|
||||
events.forEach(event => {
|
||||
const yxml = event.target
|
||||
|
||||
Reference in New Issue
Block a user