Selaa lähdekoodia

Made DropdownView synchronous.

Aleksander Nowodzinski 8 vuotta sitten
vanhempi
sitoutus
8fad60e47e

+ 1 - 1
packages/ckeditor5-ui/src/dropdown/dropdownview.js

@@ -138,7 +138,7 @@ export default class DropdownView extends View {
 		this.keystrokes.set( 'arrowleft', closeDropdown );
 		this.keystrokes.set( 'arrowleft', closeDropdown );
 		this.keystrokes.set( 'esc', closeDropdown );
 		this.keystrokes.set( 'esc', closeDropdown );
 
 
-		return super.init();
+		super.init();
 	}
 	}
 
 
 	/**
 	/**

+ 6 - 8
packages/ckeditor5-ui/tests/dropdown/dropdownview.js

@@ -100,10 +100,9 @@ describe( 'DropdownView', () => {
 
 
 			const spy = sinon.spy( view.keystrokes, 'listenTo' );
 			const spy = sinon.spy( view.keystrokes, 'listenTo' );
 
 
-			return view.init().then( () => {
-				sinon.assert.calledOnce( spy );
-				sinon.assert.calledWithExactly( spy, view.element );
-			} );
+			view.init();
+			sinon.assert.calledOnce( spy );
+			sinon.assert.calledWithExactly( spy, view.element );
 		} );
 		} );
 
 
 		it( 'adds #element to #focusTracker', () => {
 		it( 'adds #element to #focusTracker', () => {
@@ -113,10 +112,9 @@ describe( 'DropdownView', () => {
 
 
 			const spy = sinon.spy( view.focusTracker, 'add' );
 			const spy = sinon.spy( view.focusTracker, 'add' );
 
 
-			return view.init().then( () => {
-				sinon.assert.calledOnce( spy );
-				sinon.assert.calledWithExactly( spy, view.element );
-			} );
+			view.init();
+			sinon.assert.calledOnce( spy );
+			sinon.assert.calledWithExactly( spy, view.element );
 		} );
 		} );
 
 
 		describe( 'activates keyboard navigation for the dropdown', () => {
 		describe( 'activates keyboard navigation for the dropdown', () => {

+ 3 - 3
packages/ckeditor5-ui/tests/dropdown/list/createlistdropdown.js

@@ -25,9 +25,9 @@ describe( 'createListDropdown', () => {
 			label: 'foo'
 			label: 'foo'
 		} );
 		} );
 
 
-		return ( view = createListDropdown( model, locale ) ).init().then( () => {
-			document.body.appendChild( view.element );
-		} );
+		view = createListDropdown( model, locale );
+		view.init();
+		document.body.appendChild( view.element );
 	} );
 	} );
 
 
 	describe( 'constructor()', () => {
 	describe( 'constructor()', () => {

+ 2 - 3
packages/ckeditor5-ui/tests/dropdown/manual/dropdown.js

@@ -14,9 +14,8 @@ import createListDropdown from '../../../src/dropdown/list/createlistdropdown';
 import '@ckeditor/ckeditor5-theme-lark/theme/theme.scss';
 import '@ckeditor/ckeditor5-theme-lark/theme/theme.scss';
 
 
 function renderInto( selector, view ) {
 function renderInto( selector, view ) {
-	view.init().then( () => {
-		document.querySelector( selector ).appendChild( view.element );
-	} );
+	view.init();
+	document.querySelector( selector ).appendChild( view.element );
 }
 }
 
 
 function testEmpty() {
 function testEmpty() {