Przeglądaj źródła

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

Piotrek Koszuliński 7 lat temu
rodzic
commit
abeea13324

+ 2 - 2
packages/ckeditor5-editor-classic/src/classiceditorui.js

@@ -72,9 +72,9 @@ export default class ClassicEditorUI {
 		}
 
 		// Setup the editable.
-		const editingRoot = editor.editing.view.getRoot();
+		const editingRoot = editor.editing.view.document.getRoot();
 		view.editable.bind( 'isReadOnly' ).to( editingRoot );
-		view.editable.bind( 'isFocused' ).to( editor.editing.view );
+		view.editable.bind( 'isFocused' ).to( editor.editing.view.document );
 		view.editable.name = editingRoot.rootName;
 
 		this.focusTracker.add( this.view.editableElement );

+ 0 - 6
packages/ckeditor5-editor-classic/src/classiceditoruiview.js

@@ -46,12 +46,6 @@ export default class ClassicEditorUIView extends BoxedEditorUIView {
 		 */
 		this.toolbar = new ToolbarView( locale );
 
-		this.toolbar.extendTemplate( {
-			attributes: {
-				class: 'ck-editor-toolbar'
-			}
-		} );
-
 		/**
 		 * Editable UI view.
 		 *

+ 3 - 3
packages/ckeditor5-editor-classic/tests/classiceditorui.js

@@ -104,7 +104,7 @@ describe( 'ClassicEditorUI', () => {
 			} );
 
 			it( 'sets view.editable#name', () => {
-				const editable = editor.editing.view.getRoot();
+				const editable = editor.editing.view.document.getRoot();
 
 				expect( view.editable.name ).to.equal( editable.rootName );
 			} );
@@ -114,14 +114,14 @@ describe( 'ClassicEditorUI', () => {
 					view.editable,
 					{ isFocused: false },
 					[
-						[ editor.editing.view, { isFocused: true } ]
+						[ editor.editing.view.document, { isFocused: true } ]
 					],
 					{ isFocused: true }
 				);
 			} );
 
 			it( 'binds view.editable#isReadOnly', () => {
-				const editable = editor.editing.view.getRoot();
+				const editable = editor.editing.view.document.getRoot();
 
 				utils.assertBinding(
 					view.editable,

+ 0 - 4
packages/ckeditor5-editor-classic/tests/classiceditoruiview.js

@@ -44,10 +44,6 @@ describe( 'ClassicEditorUIView', () => {
 				expect( view.toolbar ).to.be.instanceof( ToolbarView );
 			} );
 
-			it( 'is given the right CSS class', () => {
-				expect( view.toolbar.element.classList.contains( 'ck-editor-toolbar' ) ).to.be.true;
-			} );
-
 			it( 'is given a locate object', () => {
 				expect( view.toolbar.locale ).to.equal( locale );
 			} );

+ 1 - 3
packages/ckeditor5-editor-classic/tests/manual/classiceditor.js

@@ -28,7 +28,7 @@ function initEditor() {
 			console.log( 'You can now play with it using global `editor` and `editable` variables.' );
 
 			window.editor = editor = newEditor;
-			window.editable = editable = editor.editing.view.getRoot();
+			window.editable = editable = editor.editing.view.document.getRoot();
 
 			observer = testUtils.createObserver();
 			observer.observe( 'Editable', editable, [ 'isFocused' ] );
@@ -53,5 +53,3 @@ function destroyEditor() {
 
 document.getElementById( 'initEditor' ).addEventListener( 'click', initEditor );
 document.getElementById( 'destroyEditor' ).addEventListener( 'click', destroyEditor );
-
-initEditor();