Sfoglia il codice sorgente

Internal: Removed `Model#event:_change`.

Szymon Cofalik 6 anni fa
parent
commit
caba092b86

+ 0 - 3
packages/ckeditor5-engine/src/model/model.js

@@ -737,9 +737,6 @@ export default class Model {
 			const callbackReturnValue = this._pendingChanges[ 0 ].callback( this._currentWriter );
 			ret.push( callbackReturnValue );
 
-			// Fire '_change' event before resetting differ.
-			this.fire( '_change', this._currentWriter );
-
 			this.document._handleChangeBlock( this._currentWriter );
 
 			this._pendingChanges.shift();

+ 31 - 41
packages/ckeditor5-engine/tests/model/model.js

@@ -206,95 +206,85 @@ describe( 'Model', () => {
 		} );
 
 		it( 'should be possible to nest enqueueChange in enqueueChange event', () => {
-			model.once( '_change', () => {
-				changes += 'B';
-			} );
-
 			model.enqueueChange( () => {
+				changes += 'A';
+
 				model.enqueueChange( () => {
 					changes += 'C';
 				} );
 
-				changes += 'A';
+				changes += 'B';
 			} );
 
 			expect( changes ).to.equal( 'ABC' );
 		} );
 
 		it( 'should be possible to nest enqueueChange in changes event', () => {
-			model.once( '_change', () => {
-				changes += 'B';
-			} );
-
 			model.change( () => {
+				changes += 'A';
+
 				model.enqueueChange( () => {
 					changes += 'C';
 				} );
 
-				changes += 'A';
+				changes += 'B';
 			} );
 
 			expect( changes ).to.equal( 'ABC' );
 		} );
 
 		it( 'should be possible to nest changes in enqueueChange event', () => {
-			model.once( '_change', () => {
-				changes += 'C';
-			} );
-
 			model.enqueueChange( () => {
+				changes += 'A';
+
 				model.change( () => {
-					changes += 'A';
+					changes += 'B';
 				} );
 
-				changes += 'B';
+				changes += 'C';
 			} );
 
 			expect( changes ).to.equal( 'ABC' );
 		} );
 
 		it( 'should be possible to nest changes in changes event', () => {
-			model.once( '_change', () => {
-				changes += 'C';
-			} );
-
 			model.change( () => {
+				changes += 'A';
+
 				model.change( () => {
-					changes += 'A';
+					changes += 'B';
 				} );
 
-				changes += 'B';
+				changes += 'C';
 			} );
 
 			expect( changes ).to.equal( 'ABC' );
 		} );
 
 		it( 'should let mix blocks', () => {
-			model.once( '_change', () => {
-				model.change( () => {
-					changes += 'B';
-
-					nestedEnqueue();
-				} );
+			model.change( () => {
+				changes += 'A';
 
-				model.change( () => {
+				model.enqueueChange( () => {
 					changes += 'C';
-				} );
 
-				changes += 'D';
-			} );
+					model.change( () => {
+						changes += 'D';
 
-			model.change( () => {
-				changes += 'A';
-			} );
-
-			expect( changes ).to.equal( 'ABCDE' );
+						model.enqueueChange( () => {
+							changes += 'F';
+						} );
+					} );
 
-			function nestedEnqueue() {
-				model.enqueueChange( () => {
-					changes += 'E';
+					model.change( () => {
+						changes += 'E';
+					} );
 				} );
-			}
+
+				changes += 'B';
+			} );
+
+			expect( changes ).to.equal( 'ABCDEF' );
 		} );
 
 		it( 'should use the same writer in all change blocks (change & change)', () => {