Преглед изворни кода

Use __className instead of __class in serialized models.

Maciej Gołaszewski пре 9 година
родитељ
комит
c0f5275612

+ 5 - 5
packages/ckeditor5-engine/src/treemodel/delta/delta.js

@@ -138,7 +138,7 @@ export default class Delta {
 	toJSON() {
 		let json = clone( this );
 
-		json.__class = this.constructor.className;
+		json.__className = this.constructor.className;
 
 		json.batch = null;
 
@@ -175,7 +175,7 @@ export default class Delta {
 	 * @returns {engine.treeModel.delta.InsertDelta}
 	 */
 	static fromJSON( json, doc ) {
-		if ( !deserializers.has( json.__class ) ) {
+		if ( !deserializers.has( json.__className ) ) {
 			/**
 			 * This delta has no defined deserializer.
 			 *
@@ -184,16 +184,16 @@ export default class Delta {
 			 */
 			throw new CKEditorError(
 				'delta-fromjson-no-deserializer: This delta has no defined deserializer',
-				{ name: json.__class }
+				{ name: json.__className }
 			);
 		}
 
-		let Constructor = deserializers.get( json.__class );
+		let Constructor = deserializers.get( json.__className );
 
 		let delta = new Constructor();
 
 		if ( json.operations.length ) {
-			json.operations.forEach( ( operation ) => delta.addOperation( operations[ operation.__class ].fromJSON( operation, doc ) ) );
+			json.operations.forEach( ( operation ) => delta.addOperation( operations[ operation.__className ].fromJSON( operation, doc ) ) );
 		}
 
 		return delta;

+ 1 - 1
packages/ckeditor5-engine/src/treemodel/operation/operation.js

@@ -83,7 +83,7 @@ export default class Operation {
 	toJSON() {
 		const json = clone( this, true );
 
-		json.__class = this.constructor.className;
+		json.__className = this.constructor.className;
 
 		// Due to circular references we need to remove parent reference.
 		json.delta = this.delta ? `[${this.delta.constructor.className}]` : null;

+ 10 - 10
packages/ckeditor5-engine/tests/treemodel/delta/delta.js

@@ -149,7 +149,7 @@ describe( 'Delta', () => {
 
 		it( 'should return JSON representation for empty delta', () => {
 			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
-				__class: FooDelta.className,
+				__className: FooDelta.className,
 				batch: null,
 				operations: []
 			} );
@@ -167,7 +167,7 @@ describe( 'Delta', () => {
 			delta.addOperation( operation );
 
 			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
-				__class: FooDelta.className,
+				__className: FooDelta.className,
 				batch: null,
 				operations: [ treeModelTestUtils.jsonParseStringify( operation ) ]
 			} );
@@ -183,7 +183,7 @@ describe( 'Delta', () => {
 			delta.addOperation( operation );
 
 			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
-				__class: FooDelta.className,
+				__className: FooDelta.className,
 				batch: null,
 				operations: [ treeModelTestUtils.jsonParseStringify( operation ) ]
 			} );
@@ -200,7 +200,7 @@ describe( 'Delta', () => {
 			delta.addOperation( operation );
 
 			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
-				__class: FooDelta.className,
+				__className: FooDelta.className,
 				batch: null,
 				operations: [ treeModelTestUtils.jsonParseStringify( operation ) ]
 			} );
@@ -212,7 +212,7 @@ describe( 'Delta', () => {
 			delta.addOperation( operation );
 
 			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
-				__class: FooDelta.className,
+				__className: FooDelta.className,
 				batch: null,
 				operations: [ treeModelTestUtils.jsonParseStringify( operation ) ]
 			} );
@@ -229,7 +229,7 @@ describe( 'Delta', () => {
 			delta.addOperation( operation );
 
 			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
-				__class: FooDelta.className,
+				__className: FooDelta.className,
 				batch: null,
 				operations: [ treeModelTestUtils.jsonParseStringify( operation ) ]
 			} );
@@ -245,7 +245,7 @@ describe( 'Delta', () => {
 			delta.addOperation( operation );
 
 			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
-				__class: FooDelta.className,
+				__className: FooDelta.className,
 				batch: null,
 				operations: [ treeModelTestUtils.jsonParseStringify( operation ) ]
 			} );
@@ -257,7 +257,7 @@ describe( 'Delta', () => {
 			delta.addOperation( operation );
 
 			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
-				__class: FooDelta.className,
+				__className: FooDelta.className,
 				batch: null,
 				operations: [ treeModelTestUtils.jsonParseStringify( operation ) ]
 			} );
@@ -267,7 +267,7 @@ describe( 'Delta', () => {
 			delta.batch = { foo: 'bar' };
 
 			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
-				__class: FooDelta.className,
+				__className: FooDelta.className,
 				batch: null,
 				operations: []
 			} );
@@ -379,7 +379,7 @@ describe( 'Delta', () => {
 		it( 'should add delta deserializer', ( done ) => {
 			registerDeserializer( 'foo', deserializer );
 
-			Delta.fromJSON( { __class: 'foo', operations: [] } );
+			Delta.fromJSON( { __className: 'foo', operations: [] } );
 
 			function deserializer() {
 				done();

+ 2 - 2
packages/ckeditor5-engine/tests/treemodel/operation/attributeoperation.js

@@ -380,9 +380,9 @@ describe( 'AttributeOperation', () => {
 
 			const serialized = treeModelTestUtils.jsonParseStringify( op );
 
-			expect( serialized.__class ).to.equal( 'engine.treeModel.operation.AttributeOperation' );
+			expect( serialized.__className ).to.equal( 'engine.treeModel.operation.AttributeOperation' );
 			expect( serialized ).to.deep.equal( {
-				__class: 'engine.treeModel.operation.AttributeOperation',
+				__className: 'engine.treeModel.operation.AttributeOperation',
 				baseVersion: 0,
 				delta: null,
 				key: 'key',

+ 1 - 1
packages/ckeditor5-engine/tests/treemodel/operation/insertoperation.js

@@ -188,7 +188,7 @@ describe( 'InsertOperation', () => {
 			const serialized = treeModelTestUtils.jsonParseStringify( op );
 
 			expect( serialized ).to.deep.equal( {
-				__class: 'engine.treeModel.operation.InsertOperation',
+				__className: 'engine.treeModel.operation.InsertOperation',
 				baseVersion: 0,
 				delta: null,
 				nodeList: treeModelTestUtils.jsonParseStringify( new NodeList( 'x' ) ),

+ 1 - 1
packages/ckeditor5-engine/tests/treemodel/operation/moveoperation.js

@@ -268,7 +268,7 @@ describe( 'MoveOperation', () => {
 			const serialized = treeModelTestUtils.jsonParseStringify( op );
 
 			expect( serialized ).to.deep.equal( {
-				__class: 'engine.treeModel.operation.MoveOperation',
+				__className: 'engine.treeModel.operation.MoveOperation',
 				baseVersion: 0,
 				delta: null,
 				howMany: 1,

+ 1 - 1
packages/ckeditor5-engine/tests/treemodel/operation/nooperation.js

@@ -43,7 +43,7 @@ describe( 'NoOperation', () => {
 			const serialized = treeModelTestUtils.jsonParseStringify( noop );
 
 			expect( serialized ).to.deep.equal( {
-				__class: 'engine.treeModel.operation.NoOperation',
+				__className: 'engine.treeModel.operation.NoOperation',
 				baseVersion: 0,
 				delta: null
 			} );

+ 1 - 1
packages/ckeditor5-engine/tests/treemodel/operation/operation.js

@@ -39,7 +39,7 @@ describe( 'Operation', () => {
 			const serialized = treeModelTestUtils.jsonParseStringify( op );
 
 			expect( serialized ).to.deep.equal( {
-				__class: 'engine.treeModel.operation.Operation',
+				__className: 'engine.treeModel.operation.Operation',
 				baseVersion: 4,
 				delta: null
 			} );

+ 1 - 1
packages/ckeditor5-engine/tests/treemodel/operation/reinsertoperation.js

@@ -99,7 +99,7 @@ describe( 'ReinsertOperation', () => {
 			const serialized = treeModelTestUtils.jsonParseStringify( operation );
 
 			expect( serialized ).to.deep.equal( {
-				__class: 'engine.treeModel.operation.ReinsertOperation',
+				__className: 'engine.treeModel.operation.ReinsertOperation',
 				baseVersion: 0,
 				delta: null,
 				howMany: 2,

+ 1 - 1
packages/ckeditor5-engine/tests/treemodel/operation/removeoperation.js

@@ -129,7 +129,7 @@ describe( 'RemoveOperation', () => {
 			const serialized = treeModelTestUtils.jsonParseStringify( op );
 
 			expect( serialized ).to.deep.equal( {
-				__class: 'engine.treeModel.operation.RemoveOperation',
+				__className: 'engine.treeModel.operation.RemoveOperation',
 				baseVersion: 0,
 				delta: null,
 				howMany: 2,

+ 2 - 2
packages/ckeditor5-engine/tests/treemodel/operation/rootattributeoperation.js

@@ -237,9 +237,9 @@ describe( 'RootAttributeOperation', () => {
 
 			const serialized = treeModelTestUtils.jsonParseStringify( op );
 
-			expect( serialized.__class ).to.equal( 'engine.treeModel.operation.RootAttributeOperation' );
+			expect( serialized.__className ).to.equal( 'engine.treeModel.operation.RootAttributeOperation' );
 			expect( serialized ).to.deep.equal( {
-				__class: 'engine.treeModel.operation.RootAttributeOperation',
+				__className: 'engine.treeModel.operation.RootAttributeOperation',
 				baseVersion: 0,
 				delta: null,
 				key: 'key',