Explorar el Código

Merge branch 'master' into t/289

Aleksander Nowodzinski hace 8 años
padre
commit
7fa87c71bd

+ 2 - 2
packages/ckeditor5-ui/src/toolbar/normalizetoolbarconfig.js

@@ -10,12 +10,12 @@
 /**
  * Normalizes the toolbar configuration (`config.toolbar`), which may be defined as an `Array`:
  *
- * 		toolbar: [ 'headings', 'bold', 'italic', 'link', 'unlink', ... ]
+ * 		toolbar: [ 'headings', 'bold', 'italic', 'link', ... ]
  *
  * or an `Object`:
  *
  *		toolbar: {
- *			items: [ 'headings', 'bold', 'italic', 'link', 'unlink', ... ],
+ *			items: [ 'headings', 'bold', 'italic', 'link', ... ],
  *			...
  *		}
  *

+ 12 - 0
packages/ckeditor5-ui/tests/panel/balloon/balloonpanelview.js

@@ -20,11 +20,15 @@ describe( 'BalloonPanelView', () => {
 	beforeEach( () => {
 		view = new BalloonPanelView();
 
+		global.document.body.appendChild( view.element );
+
 		return view.init();
 	} );
 
 	afterEach( () => {
 		if ( view ) {
+			view.element.remove();
+
 			return view.destroy();
 		}
 	} );
@@ -167,6 +171,9 @@ describe( 'BalloonPanelView', () => {
 			limiter = document.createElement( 'div' );
 			target = document.createElement( 'div' );
 
+			global.document.body.appendChild( limiter );
+			global.document.body.appendChild( target );
+
 			// Mock balloon panel element dimensions.
 			mockBoundingBox( view.element, {
 				top: 0,
@@ -189,6 +196,11 @@ describe( 'BalloonPanelView', () => {
 			testUtils.sinon.stub( global, 'window' ).value( windowStub );
 		} );
 
+		afterEach( () => {
+			limiter.remove();
+			target.remove();
+		} );
+
 		it( 'should use default options', () => {
 			const spy = testUtils.sinon.spy( positionUtils, 'getOptimalPosition' );