Răsfoiți Sursa

Refactoring.

Krzysztof Krztoń 7 ani în urmă
părinte
comite
edea693862

+ 8 - 8
packages/ckeditor5-ui/src/editableui/editableuiview.js

@@ -63,31 +63,31 @@ export default class EditableUIView extends View {
 		 * The element which is the main editable element (usually the one with `contentEditable="true"`).
 		 *
 		 * @readonly
-		 * @member {HTMLElement} #editableElement
+		 * @member {HTMLElement} #_editableElement
 		 */
-		this.editableElement = editableElement;
+		this._editableElement = editableElement;
 
 		/**
-		 * Whether an external {@link #editableElement} was passed into the constructor, which also means
+		 * Whether an external {@link #_editableElement} was passed into the constructor, which also means
 		 * the view will not render its {@link #template}.
 		 *
 		 * @protected
 		 * @member {Boolean} #_hasExternalElement
 		 */
-		this._hasExternalElement = !!this.editableElement;
+		this._hasExternalElement = !!this._editableElement;
 	}
 
 	/**
 	 * Renders the view by either applying the {@link #template} to the existing
-	 * {@link #editableElement} or assigning {@link #element} as {@link #editableElement}.
+	 * {@link #_editableElement} or assigning {@link #element} as {@link #_editableElement}.
 	 */
 	render() {
 		super.render();
 
 		if ( this._hasExternalElement ) {
-			this.template.apply( this.element = this.editableElement );
+			this.template.apply( this.element = this._editableElement );
 		} else {
-			this.editableElement = this.element;
+			this._editableElement = this.element;
 		}
 	}
 
@@ -96,7 +96,7 @@ export default class EditableUIView extends View {
 	 */
 	destroy() {
 		if ( this._hasExternalElement ) {
-			this.template.revert( this.editableElement );
+			this.template.revert( this._editableElement );
 		}
 
 		super.destroy();

+ 1 - 1
packages/ckeditor5-ui/src/toolbar/balloon/balloontoolbar.js

@@ -62,7 +62,7 @@ export default class BalloonToolbar extends Plugin {
 
 		// Wait for the EditorUI#init. EditableElement is not available before.
 		editor.ui.once( 'ready', () => {
-			this.focusTracker.add( editor.ui.view.editable.editableElement );
+			this.focusTracker.add( editor.ui.view.editable.element );
 			this.focusTracker.add( this.toolbarView.element );
 		} );
 

+ 2 - 2
packages/ckeditor5-ui/tests/editableui/editableuiview.js

@@ -34,7 +34,7 @@ describe( 'EditableUIView', () => {
 			view = new EditableUIView( locale );
 
 			view.render();
-			expect( view.element ).to.equal( view.editableElement );
+			expect( view.element ).to.equal( view._editableElement );
 			expect( view.element.classList.contains( 'ck' ) ).to.be.true;
 			expect( view.element.classList.contains( 'ck-editor__editable' ) ).to.be.true;
 			expect( view.element.classList.contains( 'ck-content' ) ).to.be.true;
@@ -48,7 +48,7 @@ describe( 'EditableUIView', () => {
 
 			view.render();
 			expect( view.element ).to.equal( editableElement );
-			expect( view.element ).to.equal( view.editableElement );
+			expect( view.element ).to.equal( view._editableElement );
 			expect( view.element.classList.contains( 'ck' ) ).to.be.true;
 			expect( view.element.classList.contains( 'ck-editor__editable' ) ).to.be.true;
 			expect( view.element.classList.contains( 'ck-rounded-corners' ) ).to.be.true;

+ 1 - 1
packages/ckeditor5-ui/tests/editableui/inline/inlineeditableuiview.js

@@ -31,7 +31,7 @@ describe( 'InlineEditableUIView', () => {
 		it( 'accepts editableElement', () => {
 			view = new InlineEditableUIView( locale, editableElement );
 
-			expect( view.editableElement ).to.equal( editableElement );
+			expect( view._editableElement ).to.equal( editableElement );
 		} );
 
 		it( 'creates view#element from template when no editableElement provided', () => {