Merge branch 't/ckeditor5/416e' into t/ckeditor5/416d

ckeditor · Oct 14, 2019 · e439ed1 · e439ed1
2 parents 0fd2480 + cd07983
commit e439ed1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/classiceditorui.js b/src/classiceditorui.js
@@ -148,7 +148,6 @@ export default class ClassicEditorUI extends EditorUI {
 			view.stickyPanel.viewportTopOffset = this._toolbarConfig.viewportTopOffset;
 		}
 
-		view.toolbar.shouldGroupWhenFull = true;
 		view.toolbar.fillFromConfig( this._toolbarConfig.items, this.componentFactory );
 
 		enableToolbarKeyboardFocus( {

diff --git a/src/classiceditoruiview.js b/src/classiceditoruiview.js
@@ -45,7 +45,9 @@ export default class ClassicEditorUIView extends BoxedEditorUIView {
 		 * @readonly
 		 * @member {module:ui/toolbar/toolbarview~ToolbarView}
 		 */
-		this.toolbar = new ToolbarView( locale );
+		this.toolbar = new ToolbarView( locale, {
+			shouldGroupWhenFull: true
+		} );
 
 		/**
 		 * Editable UI view.

diff --git a/tests/classiceditorui.js b/tests/classiceditorui.js
@@ -165,10 +165,6 @@ describe( 'ClassicEditorUI', () => {
 		} );
 
 		describe( 'view.toolbar', () => {
-			it( 'has automatic items grouping enabled', () => {
-				expect( view.toolbar.shouldGroupWhenFull ).to.be.true;
-			} );
-
 			describe( '#items', () => {
 				it( 'are filled with the config.toolbar (specified as an Array)', () => {
 					return VirtualClassicTestEditor

diff --git a/tests/classiceditoruiview.js b/tests/classiceditoruiview.js
@@ -58,6 +58,10 @@ describe( 'ClassicEditorUIView', () => {
 			it( 'is put into the "stickyPanel.content" collection', () => {
 				expect( view.stickyPanel.content.get( 0 ) ).to.equal( view.toolbar );
 			} );
+
+			it( 'has automatic items grouping enabled', () => {
+				expect( view.toolbar.options.shouldGroupWhenFull ).to.be.true;
+			} );
 		} );
 
 		describe( '#editable', () => {