瀏覽代碼

Adjusted to changes made to engine view.

Szymon Kupś 7 年之前
父節點
當前提交
dedb59987f

+ 5 - 4
packages/ckeditor5-enter/src/enter.js

@@ -26,17 +26,18 @@ export default class Enter extends Plugin {
 
 	init() {
 		const editor = this.editor;
-		const editingView = editor.editing.view;
+		const view = editor.editing.view;
+		const viewDocument = view.document;
 
-		editingView.addObserver( EnterObserver );
+		view.addObserver( EnterObserver );
 
 		editor.commands.add( 'enter', new EnterCommand( editor ) );
 
 		// TODO We may use the keystroke handler for that.
-		this.listenTo( editingView, 'enter', ( evt, data ) => {
+		this.listenTo( viewDocument, 'enter', ( evt, data ) => {
 			editor.execute( 'enter' );
 			data.preventDefault();
-			editingView.scrollToTheSelection();
+			view.scrollToTheSelection();
 		}, { priority: 'low' } );
 	}
 }

+ 4 - 2
packages/ckeditor5-enter/src/enterobserver.js

@@ -17,8 +17,10 @@ import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
  * @extends module:engine/view/observer~Observer
  */
 export default class EnterObserver extends Observer {
-	constructor( document ) {
-		super( document );
+	constructor( view ) {
+		super( view );
+
+		const document = this.document;
 
 		document.on( 'keydown', ( evt, data ) => {
 			if ( this.isEnabled && data.keyCode == keyCodes.enter ) {

+ 5 - 7
packages/ckeditor5-enter/tests/enter.js

@@ -9,7 +9,7 @@ import EnterCommand from '../src/entercommand';
 import DomEventData from '@ckeditor/ckeditor5-engine/src/view/observer/domeventdata';
 
 describe( 'Enter feature', () => {
-	let editor, editingView;
+	let editor, viewDocument;
 
 	beforeEach( () => {
 		return VirtualTestEditor
@@ -18,7 +18,7 @@ describe( 'Enter feature', () => {
 			} )
 			.then( newEditor => {
 				editor = newEditor;
-				editingView = editor.editing.view;
+				viewDocument = editor.editing.view.document;
 			} );
 	} );
 
@@ -28,10 +28,9 @@ describe( 'Enter feature', () => {
 
 	it( 'listens to the editing view enter event', () => {
 		const spy = editor.execute = sinon.spy();
-		const view = editor.editing.view;
 		const domEvt = getDomEvent();
 
-		view.fire( 'enter', new DomEventData( editingView, domEvt ) );
+		viewDocument.fire( 'enter', new DomEventData( viewDocument, domEvt ) );
 
 		expect( spy.calledOnce ).to.be.true;
 		expect( spy.calledWithExactly( 'enter' ) ).to.be.true;
@@ -40,12 +39,11 @@ describe( 'Enter feature', () => {
 	} );
 
 	it( 'scrolls the editing document to the selection after executing the command', () => {
-		const view = editor.editing.view;
 		const domEvt = getDomEvent();
 		const executeSpy = editor.execute = sinon.spy();
-		const scrollSpy = sinon.stub( view, 'scrollToTheSelection' );
+		const scrollSpy = sinon.stub( editor.editing.view, 'scrollToTheSelection' );
 
-		view.fire( 'enter', new DomEventData( editingView, domEvt ) );
+		viewDocument.fire( 'enter', new DomEventData( viewDocument, domEvt ) );
 
 		sinon.assert.calledOnce( scrollSpy );
 		sinon.assert.callOrder( executeSpy, scrollSpy );

+ 6 - 5
packages/ckeditor5-enter/tests/enterobserver.js

@@ -5,25 +5,26 @@
 
 /* globals document */
 
-import ViewDocument from '@ckeditor/ckeditor5-engine/src/view/document';
+import View from '@ckeditor/ckeditor5-engine/src/view/view';
 import EnterObserver from '../src/enterobserver';
 import DomEventData from '@ckeditor/ckeditor5-engine/src/view/observer/domeventdata';
 import createViewRoot from '@ckeditor/ckeditor5-engine/tests/view/_utils/createroot';
 import { getCode } from '@ckeditor/ckeditor5-utils/src/keyboard';
 
 describe( 'EnterObserver', () => {
-	let viewDocument;
+	let view, viewDocument;
 
 	beforeEach( () => {
-		viewDocument = new ViewDocument();
-		viewDocument.addObserver( EnterObserver );
+		view = new View();
+		viewDocument = view.document;
+		view.addObserver( EnterObserver );
 	} );
 
 	// See #10.
 	it( 'can be initialized', () => {
 		expect( () => {
 			createViewRoot( viewDocument );
-			viewDocument.attachDomRoot( document.createElement( 'div' ) );
+			view.attachDomRoot( document.createElement( 'div' ) );
 		} ).to.not.throw();
 	} );