8
0
Просмотр исходного кода

Renamed EditableUIView#isRendered to EditableUIView#externalElement.

Aleksander Nowodzinski 9 лет назад
Родитель
Сommit
50a534a3a0

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

@@ -60,13 +60,12 @@ export default class EditableUIView extends View {
 		this.set( 'isFocused', false );
 
 		/**
-		 * Indicates whether the view operates on an external {@link #editableElement} or
-		 * rendered it on its own.
+		 * An external {@link #editableElement} passed into the constructor, which also means
+		 * the view will not render its {@link #template}.
 		 *
-		 * @observable
-		 * @member {Boolean} #isRendered
+		 * @member {HTMLElement} #externalElement
 		 */
-		this.set( 'isRendered', !editableElement );
+		this.externalElement = editableElement;
 
 		/**
 		 * The element which is the main editable element (usually the one with `contentEditable="true"`).
@@ -83,8 +82,8 @@ export default class EditableUIView extends View {
 	 * @returns {Promise}
 	 */
 	init() {
-		if ( !this.isRendered ) {
-			this.template.apply( this.editableElement );
+		if ( this.externalElement ) {
+			this.template.apply( this.externalElement );
 		} else {
 			this.editableElement = this.element;
 		}
@@ -96,8 +95,8 @@ export default class EditableUIView extends View {
 	 * @inheritDoc
 	 */
 	destroy() {
-		if ( !this.isRendered ) {
-			this.template.revert( this.editableElement );
+		if ( this.externalElement ) {
+			this.template.revert( this.externalElement );
 		}
 
 		return super.destroy();

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

@@ -26,7 +26,7 @@ describe( 'EditableUIView', () => {
 		it( 'sets initial values of attributes', () => {
 			expect( view.isReadOnly ).to.be.false;
 			expect( view.isFocused ).to.be.false;
-			expect( view.isRendered ).to.be.true;
+			expect( view.externalElement ).to.be.undefined;
 		} );
 
 		it( 'renders element from template when no editableElement', () => {
@@ -35,6 +35,7 @@ describe( 'EditableUIView', () => {
 			return view.init().then( () => {
 				expect( view.element ).to.equal( view.editableElement );
 				expect( view.element.classList.contains( 'ck-editor__editable' ) ).to.be.true;
+				expect( view.externalElement ).to.be.undefined;
 			} );
 		} );
 
@@ -45,7 +46,7 @@ describe( 'EditableUIView', () => {
 				expect( view.element ).to.equal( editableElement );
 				expect( view.element ).to.equal( view.editableElement );
 				expect( view.element.classList.contains( 'ck-editor__editable' ) ).to.be.true;
-				expect( view.isRendered ).to.be.false;
+				expect( view.externalElement ).to.equal( editableElement );
 			} );
 		} );
 	} );