Browse Source

Reverted MarkerCollection update event's params.

Maciej Bukowski 7 years ago
parent
commit
9d0ba95dd8

+ 2 - 2
packages/ckeditor5-engine/src/model/document.js

@@ -166,9 +166,9 @@ export default class Document {
 		// Buffer marker changes.
 		// This is not covered in buffering operations because markers may change outside of them (when they
 		// are modified using `model.markers` collection, not through `MarkerOperation`).
-		this.listenTo( model.markers, 'update', ( evt, marker, oldRange, newRange, affectsData ) => {
+		this.listenTo( model.markers, 'update', ( evt, marker, oldRange, newRange ) => {
 			// Whenever marker is updated, buffer that change.
-			this.differ.bufferMarkerChange( marker.name, oldRange, newRange, affectsData );
+			this.differ.bufferMarkerChange( marker.name, oldRange, newRange, marker.affectsData );
 
 			if ( oldRange === null ) {
 				// If this is a new marker, add a listener that will buffer change whenever marker changes.

+ 2 - 2
packages/ckeditor5-engine/src/model/markercollection.js

@@ -116,7 +116,7 @@ export default class MarkerCollection {
 			}
 
 			if ( hasChanged ) {
-				this.fire( 'update:' + markerName, oldMarker, oldRange, range, affectsData );
+				this.fire( 'update:' + markerName, oldMarker, oldRange, range );
 			}
 
 			return oldMarker;
@@ -126,7 +126,7 @@ export default class MarkerCollection {
 		const marker = new Marker( markerName, liveRange, managedUsingOperations, affectsData );
 
 		this._markers.set( markerName, marker );
-		this.fire( 'update:' + markerName, marker, null, range, affectsData );
+		this.fire( 'update:' + markerName, marker, null, range );
 
 		return marker;
 	}

+ 3 - 3
packages/ckeditor5-engine/tests/model/markercollection.js

@@ -53,7 +53,7 @@ describe( 'MarkerCollection', () => {
 			expect( marker.managedUsingOperations ).to.be.false;
 			expect( marker.affectsData ).to.be.false;
 			expect( marker.getRange().isEqual( range ) ).to.be.true;
-			sinon.assert.calledWithExactly( markers.fire, 'update:name', result, null, range, false );
+			sinon.assert.calledWithExactly( markers.fire, 'update:name', result, null, range );
 		} );
 
 		it( 'should create a marker marked as managed by operations', () => {
@@ -80,7 +80,7 @@ describe( 'MarkerCollection', () => {
 			expect( result ).to.equal( marker );
 			expect( marker.getRange().isEqual( range2 ) ).to.be.true;
 
-			sinon.assert.calledWithExactly( markers.fire, 'update:name', marker, range, range2, false );
+			sinon.assert.calledWithExactly( markers.fire, 'update:name', marker, range, range2 );
 			sinon.assert.calledOnce( marker._detachLiveRange );
 			sinon.assert.calledOnce( marker._detachLiveRange );
 		} );
@@ -100,7 +100,7 @@ describe( 'MarkerCollection', () => {
 			expect( marker.managedUsingOperations ).to.be.true;
 			expect( marker.getRange().isEqual( range ) ).to.be.true;
 
-			sinon.assert.calledWithExactly( markers.fire, 'update:name', marker, range, range, false );
+			sinon.assert.calledWithExactly( markers.fire, 'update:name', marker, range, range );
 			sinon.assert.notCalled( marker._detachLiveRange );
 			sinon.assert.notCalled( marker._attachLiveRange );
 		} );