Kaynağa Gözat

Made EditableUIView synchronous.

Aleksander Nowodzinski 8 yıl önce
ebeveyn
işleme
752c9de6de

+ 2 - 4
packages/ckeditor5-ui/src/editableui/editableuiview.js

@@ -78,8 +78,6 @@ export default class EditableUIView extends View {
 	/**
 	/**
 	 * Initializes the view by either applying the {@link #template} to the existing
 	 * Initializes 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}.
-	 *
-	 * @returns {Promise}
 	 */
 	 */
 	init() {
 	init() {
 		if ( this.externalElement ) {
 		if ( this.externalElement ) {
@@ -88,7 +86,7 @@ export default class EditableUIView extends View {
 			this.editableElement = this.element;
 			this.editableElement = this.element;
 		}
 		}
 
 
-		return super.init();
+		super.init();
 	}
 	}
 
 
 	/**
 	/**
@@ -99,6 +97,6 @@ export default class EditableUIView extends View {
 			this.template.revert( this.externalElement );
 			this.template.revert( this.externalElement );
 		}
 		}
 
 
-		return super.destroy();
+		super.destroy();
 	}
 	}
 }
 }

+ 22 - 36
packages/ckeditor5-ui/tests/editableui/editableuiview.js

@@ -32,22 +32,20 @@ describe( 'EditableUIView', () => {
 		it( 'renders element from template when no editableElement', () => {
 		it( 'renders element from template when no editableElement', () => {
 			view = new EditableUIView( locale );
 			view = new EditableUIView( locale );
 
 
-			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;
-			} );
+			view.init();
+			expect( view.element ).to.equal( view.editableElement );
+			expect( view.element.classList.contains( 'ck-editor__editable' ) ).to.be.true;
+			expect( view.externalElement ).to.be.undefined;
 		} );
 		} );
 
 
 		it( 'accepts editableElement as an argument', () => {
 		it( 'accepts editableElement as an argument', () => {
 			view = new EditableUIView( locale, editableElement );
 			view = new EditableUIView( locale, editableElement );
 
 
-			return view.init().then( () => {
-				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.externalElement ).to.equal( editableElement );
-			} );
+			view.init();
+			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.externalElement ).to.equal( editableElement );
 		} );
 		} );
 	} );
 	} );
 
 
@@ -80,18 +78,14 @@ describe( 'EditableUIView', () => {
 		it( 'calls super#destroy()', () => {
 		it( 'calls super#destroy()', () => {
 			const spy = testUtils.sinon.spy( View.prototype, 'destroy' );
 			const spy = testUtils.sinon.spy( View.prototype, 'destroy' );
 
 
-			return view.destroy().then( () => {
-				sinon.assert.calledOnce( spy );
-			} );
+			view.destroy();
+			sinon.assert.calledOnce( spy );
 		} );
 		} );
 
 
-		it( 'can be called multiple times', done => {
+		it( 'can be called multiple times', () => {
 			expect( () => {
 			expect( () => {
-				view.destroy().then( () => {
-					return view.destroy().then( () => {
-						done();
-					} );
-				} );
+				view.destroy();
+				view.destroy();
 			} ).to.not.throw();
 			} ).to.not.throw();
 		} );
 		} );
 
 
@@ -102,14 +96,10 @@ describe( 'EditableUIView', () => {
 
 
 				view = new EditableUIView( locale, editableElement );
 				view = new EditableUIView( locale, editableElement );
 
 
-				return view.init()
-					.then( () => {
-						expect( editableElement.contentEditable ).to.equal( 'true' );
-					} )
-					.then( () => view.destroy() )
-					.then( () => {
-						expect( editableElement.contentEditable ).to.equal( 'false' );
-					} );
+				view.init();
+				expect( editableElement.contentEditable ).to.equal( 'true' );
+				view.destroy();
+				expect( editableElement.contentEditable ).to.equal( 'false' );
 			} );
 			} );
 
 
 			it( 'reverts contentEditable property of editableElement (was true)', () => {
 			it( 'reverts contentEditable property of editableElement (was true)', () => {
@@ -118,14 +108,10 @@ describe( 'EditableUIView', () => {
 
 
 				view = new EditableUIView( locale, editableElement );
 				view = new EditableUIView( locale, editableElement );
 
 
-				return view.init()
-					.then( () => {
-						expect( editableElement.contentEditable ).to.equal( 'true' );
-					} )
-					.then( () => view.destroy() )
-					.then( () => {
-						expect( editableElement.contentEditable ).to.equal( 'true' );
-					} );
+				view.init();
+				expect( editableElement.contentEditable ).to.equal( 'true' );
+				view.destroy();
+				expect( editableElement.contentEditable ).to.equal( 'true' );
 			} );
 			} );
 		} );
 		} );
 	} );
 	} );