Kaynağa Gözat

Merge branch 'master' into t/ckeditor5-dev/365

Piotrek Koszuliński 7 yıl önce
ebeveyn
işleme
a19db51346

+ 1 - 1
packages/ckeditor5-editor-inline/src/inlineeditorui.js

@@ -83,7 +83,7 @@ export default class InlineEditorUI {
 		} );
 
 		// Setup the editable.
-		const editingRoot = editor.editing.view.getRoot();
+		const editingRoot = editor.editing.view.document.getRoot();
 		view.editable.bind( 'isReadOnly' ).to( editingRoot );
 
 		// Bind to focusTracker instead of editor.editing.view because otherwise

+ 0 - 2
packages/ckeditor5-editor-inline/src/inlineeditoruiview.js

@@ -52,8 +52,6 @@ export default class InlineEditorUIView extends EditorUIView {
 		this.toolbar.extendTemplate( {
 			attributes: {
 				class: [
-					'ck-editor-toolbar',
-
 					// https://github.com/ckeditor/ckeditor5-editor-inline/issues/11
 					'ck-toolbar_floating'
 				]

+ 3 - 3
packages/ckeditor5-editor-inline/tests/inlineeditorui.js

@@ -99,12 +99,12 @@ describe( 'InlineEditorUI', () => {
 
 				view.panel.hide();
 
-				editor.editing.view.fire( 'render' );
+				editor.editing.view.render();
 				sinon.assert.notCalled( spy );
 
 				view.panel.show();
 
-				editor.editing.view.fire( 'render' );
+				editor.editing.view.render();
 				sinon.assert.calledOnce( spy );
 				sinon.assert.calledWithExactly( spy, {
 					target: view.editableElement,
@@ -117,7 +117,7 @@ describe( 'InlineEditorUI', () => {
 			let editable;
 
 			beforeEach( () => {
-				editable = editor.editing.view.getRoot();
+				editable = editor.editing.view.document.getRoot();
 			} );
 
 			it( 'registers view.editable#element in editor focus tracker', () => {

+ 0 - 1
packages/ckeditor5-editor-inline/tests/inlineeditoruiview.js

@@ -33,7 +33,6 @@ describe( 'InlineEditorUIView', () => {
 			} );
 
 			it( 'is given the right CSS classes', () => {
-				expect( view.toolbar.element.classList.contains( 'ck-editor-toolbar' ) ).to.be.true;
 				expect( view.toolbar.element.classList.contains( 'ck-toolbar_floating' ) ).to.be.true;
 			} );
 

+ 1 - 1
packages/ckeditor5-editor-inline/tests/manual/inlineeditor.js

@@ -28,7 +28,7 @@ function initEditors() {
 				console.log( 'It has been added to global `editors` and `editables`.' );
 
 				window.editors[ selector ] = editor;
-				window.editables.push( editor.editing.view.getRoot() );
+				window.editables.push( editor.editing.view.document.getRoot() );
 
 				const observer = testUtils.createObserver();