8
0
Krzysztof Krztoń 6 gadi atpakaļ
vecāks
revīzija
b3db41f229

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

@@ -82,7 +82,7 @@ export default class InlineEditorUI extends EditorUI {
 			// showing up when there's no focus in the UI.
 			if ( view.panel.isVisible ) {
 				view.panel.pin( {
-					target: view.editable.editableElement,
+					target: view.editable.element,
 					positions: view.panelPositions
 				} );
 			}
@@ -95,12 +95,12 @@ export default class InlineEditorUI extends EditorUI {
 		// Bind to focusTracker instead of editor.editing.view because otherwise
 		// focused editable styles disappear when view#toolbar is focused.
 		view.editable.bind( 'isFocused' ).to( this.focusTracker );
-		editor.editing.view.attachDomRoot( view.editable.editableElement );
+		editor.editing.view.attachDomRoot( view.editable.element );
 		view.editable.name = editingRoot.rootName;
 
-		this._editableElements.push( view.editable );
+		this._editableElements.set( view.editable.name, view.editable.element );
 
-		this.focusTracker.add( view.editable.editableElement );
+		this.focusTracker.add( view.editable.element );
 
 		view.toolbar.fillFromConfig( this._toolbarConfig.items, this.componentFactory );
 

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

@@ -12,8 +12,6 @@ import InlineEditableUIView from '@ckeditor/ckeditor5-ui/src/editableui/inline/i
 import BalloonPanelView from '@ckeditor/ckeditor5-ui/src/panel/balloon/balloonpanelview';
 import ToolbarView from '@ckeditor/ckeditor5-ui/src/toolbar/toolbarview';
 
-import log from '@ckeditor/ckeditor5-utils/src/log';
-
 /**
  * Inline editor UI view. Uses an nline editable and a floating toolbar.
  *
@@ -146,22 +144,6 @@ export default class InlineEditorUIView extends EditorUIView {
 	}
 
 	/**
-	 * **Deprecated** since `v12.0.0`. The {@link module:ui/editableui/editableuiview~EditableUIView#editableElement
-	 * `EditableUIView editableElement`} could be used instead.
-	 *
-	 * The element which is the main editable element (usually the one with `contentEditable="true"`).
-	 *
-	 * @deprecated v12.0.0 The {@link module:ui/editableui/editableuiview~EditableUIView#editableElement
-	 * `EditableUIView editableElement`} could be used instead.
-	 * @readonly
-	 * @member {HTMLElement} #editableElement
-	 */
-	get editableElement() {
-		log.warn( 'deprecated-ui-view-editableElement: The InlineEditorUIView#editableElement property is deprecated.' );
-		return this.editable.editableElement;
-	}
-
-	/**
 	 * Determines the panel top position of the {@link #panel} in {@link #panelPositions}.
 	 *
 	 * @private

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

@@ -93,7 +93,7 @@ describe( 'InlineEditorUI', () => {
 				editor.ui.fire( 'update' );
 				sinon.assert.calledOnce( spy );
 				sinon.assert.calledWithExactly( spy, {
-					target: view.editable.editableElement,
+					target: view.editable.element,
 					positions: sinon.match.array
 				} );
 			} );

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

@@ -10,7 +10,6 @@ import InlineEditableUIView from '@ckeditor/ckeditor5-ui/src/editableui/inline/i
 import Locale from '@ckeditor/ckeditor5-utils/src/locale';
 
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
-import log from '@ckeditor/ckeditor5-utils/src/log';
 
 describe( 'InlineEditorUIView', () => {
 	let locale, view;
@@ -122,16 +121,6 @@ describe( 'InlineEditorUIView', () => {
 		} );
 	} );
 
-	describe( 'editableElement', () => {
-		it( 'returns editable\'s view element', () => {
-			testUtils.sinon.stub( log, 'warn' ).callsFake( () => {} );
-
-			view.render();
-			expect( view.editableElement.getAttribute( 'contentEditable' ) ).to.equal( 'true' );
-			view.destroy();
-		} );
-	} );
-
 	describe( 'panelPositions', () => {
 		it( 'returns the positions in the right order', () => {
 			const positions = view.panelPositions;