Bladeren bron

Merge branch 'master' into t/ckeditor5/488

Szymon Cofalik 7 jaren geleden
bovenliggende
commit
9ff1da7132

+ 2 - 10
packages/ckeditor5-block-quote/src/blockquoteediting.js

@@ -8,12 +8,8 @@
  */
 
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
-
 import BlockQuoteCommand from './blockquotecommand';
 
-import { downcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/downcast-converters';
-import { upcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/upcast-converters';
-
 /**
  * The block quote editing.
  *
@@ -43,11 +39,7 @@ export default class BlockQuoteEditing extends Plugin {
 			}
 		} );
 
-		editor.conversion.for( 'downcast' )
-			.add( downcastElementToElement( { model: 'blockQuote', view: 'blockquote' } ) );
-
-		editor.conversion.for( 'upcast' )
-			.add( upcastElementToElement( { model: 'blockQuote', view: 'blockquote' } ) );
+		editor.conversion.elementToElement( { model: 'blockQuote', view: 'blockquote' } );
 	}
 
 	/**
@@ -62,7 +54,7 @@ export default class BlockQuoteEditing extends Plugin {
 		// This listener is added in afterInit in order to register it after list's feature listener.
 		// We can't use a priority for this, because 'low' is already used by the enter feature, unless
 		// we'd use numeric priority in this case.
-		this.listenTo( this.editor.editing.view, 'enter', ( evt, data ) => {
+		this.listenTo( this.editor.editing.view.document, 'enter', ( evt, data ) => {
 			const doc = this.editor.model.document;
 			const positionParent = doc.selection.getLastPosition().parent;
 

+ 16 - 15
packages/ckeditor5-block-quote/tests/integration.js

@@ -22,7 +22,7 @@ import {
 } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 
 describe( 'BlockQuote integration', () => {
-	let editor, model, element;
+	let editor, model, element, viewDocument;
 
 	beforeEach( () => {
 		element = document.createElement( 'div' );
@@ -35,6 +35,7 @@ describe( 'BlockQuote integration', () => {
 			.then( newEditor => {
 				editor = newEditor;
 				model = editor.model;
+				viewDocument = editor.editing.view.document;
 			} );
 	} );
 
@@ -57,7 +58,7 @@ describe( 'BlockQuote integration', () => {
 
 			setModelData( model, '<paragraph>x</paragraph><paragraph>[]</paragraph><paragraph>x</paragraph>' );
 
-			editor.editing.view.fire( 'enter', data );
+			viewDocument.fire( 'enter', data );
 
 			// Only enter command should be executed.
 			expect( data.preventDefault.called ).to.be.true;
@@ -71,7 +72,7 @@ describe( 'BlockQuote integration', () => {
 
 			setModelData( model, '<blockQuote><paragraph>xx[]</paragraph></blockQuote>' );
 
-			editor.editing.view.fire( 'enter', data );
+			viewDocument.fire( 'enter', data );
 
 			// Only enter command should be executed.
 			expect( data.preventDefault.called ).to.be.true;
@@ -85,7 +86,7 @@ describe( 'BlockQuote integration', () => {
 
 			setModelData( model, '<blockQuote><paragraph>[]xx</paragraph></blockQuote>' );
 
-			editor.editing.view.fire( 'enter', data );
+			viewDocument.fire( 'enter', data );
 
 			// Only enter command should be executed.
 			expect( data.preventDefault.called ).to.be.true;
@@ -99,7 +100,7 @@ describe( 'BlockQuote integration', () => {
 
 			setModelData( model, '<blockQuote><paragraph>[</paragraph><paragraph>]</paragraph></blockQuote>' );
 
-			editor.editing.view.fire( 'enter', data );
+			viewDocument.fire( 'enter', data );
 
 			// Only enter command should be executed.
 			expect( data.preventDefault.called ).to.be.true;
@@ -119,7 +120,7 @@ describe( 'BlockQuote integration', () => {
 				'<paragraph>x</paragraph>'
 			);
 
-			editor.editing.view.fire( 'enter', data );
+			viewDocument.fire( 'enter', data );
 
 			expect( data.preventDefault.called ).to.be.true;
 
@@ -139,7 +140,7 @@ describe( 'BlockQuote integration', () => {
 
 			setModelData( model, '<paragraph>x</paragraph><blockQuote><paragraph>[]</paragraph></blockQuote><paragraph>x</paragraph>' );
 
-			editor.editing.view.fire( 'enter', data );
+			viewDocument.fire( 'enter', data );
 
 			expect( data.preventDefault.called ).to.be.true;
 			expect( execSpy.calledOnce ).to.be.true;
@@ -158,7 +159,7 @@ describe( 'BlockQuote integration', () => {
 				'<paragraph>x</paragraph>'
 			);
 
-			editor.editing.view.fire( 'enter', data );
+			viewDocument.fire( 'enter', data );
 
 			expect( data.preventDefault.called ).to.be.true;
 			expect( execSpy.calledOnce ).to.be.true;
@@ -183,7 +184,7 @@ describe( 'BlockQuote integration', () => {
 				'<paragraph>x</paragraph>'
 			);
 
-			editor.editing.view.fire( 'enter', data );
+			viewDocument.fire( 'enter', data );
 
 			expect( data.preventDefault.called ).to.be.true;
 			expect( execSpy.calledOnce ).to.be.true;
@@ -208,7 +209,7 @@ describe( 'BlockQuote integration', () => {
 				'<paragraph>x</paragraph>'
 			);
 
-			editor.editing.view.fire( 'enter', data );
+			viewDocument.fire( 'enter', data );
 
 			sinon.assert.calledOnce( scrollSpy );
 			sinon.assert.callOrder( execSpy, scrollSpy );
@@ -233,7 +234,7 @@ describe( 'BlockQuote integration', () => {
 				'<paragraph>d</paragraph>'
 			);
 
-			editor.editing.view.fire( 'delete', data );
+			viewDocument.fire( 'delete', data );
 
 			expect( getModelData( model ) ).to.equal(
 				'<blockQuote><paragraph>a</paragraph><paragraph>b[]c</paragraph></blockQuote>' +
@@ -250,7 +251,7 @@ describe( 'BlockQuote integration', () => {
 				'<paragraph>y</paragraph>'
 			);
 
-			editor.editing.view.fire( 'delete', data );
+			viewDocument.fire( 'delete', data );
 
 			expect( getModelData( model ) ).to.equal(
 				'<paragraph>x[]a</paragraph>' +
@@ -269,7 +270,7 @@ describe( 'BlockQuote integration', () => {
 				'<paragraph>y</paragraph>'
 			);
 
-			editor.editing.view.fire( 'delete', data );
+			viewDocument.fire( 'delete', data );
 
 			expect( getModelData( model ) ).to.equal(
 				'<paragraph>x</paragraph>' +
@@ -288,7 +289,7 @@ describe( 'BlockQuote integration', () => {
 				'<paragraph>y</paragraph>'
 			);
 
-			editor.editing.view.fire( 'delete', data );
+			viewDocument.fire( 'delete', data );
 
 			expect( getModelData( model ) ).to.equal(
 				'<paragraph>x</paragraph>' +
@@ -306,7 +307,7 @@ describe( 'BlockQuote integration', () => {
 				'<paragraph>y</paragraph>'
 			);
 
-			editor.editing.view.fire( 'delete', data );
+			viewDocument.fire( 'delete', data );
 
 			expect( getModelData( model ) ).to.equal(
 				'<paragraph>x[]</paragraph>' +