Ver código fonte

Updated code after refactoring in ToolbarView utils.

Aleksander Nowodzinski 8 anos atrás
pai
commit
3136ddd1a2

+ 2 - 9
packages/ckeditor5-editor-classic/src/classiceditorui.js

@@ -9,10 +9,7 @@
 
 import ComponentFactory from '@ckeditor/ckeditor5-ui/src/componentfactory';
 import FocusTracker from '@ckeditor/ckeditor5-utils/src/focustracker';
-import {
-	getItemsFromConfig,
-	enableToolbarKeyboardFocus
-} from '@ckeditor/ckeditor5-ui/src/toolbar/utils';
+import enableToolbarKeyboardFocus from '@ckeditor/ckeditor5-ui/src/toolbar/enabletoolbarkeyboardfocus';
 
 /**
  * The classic editor UI class.
@@ -73,11 +70,7 @@ export default class ClassicEditorUI {
 
 		return this.view.init()
 			.then( () => {
-				return getItemsFromConfig(
-					editor.config.get( 'toolbar' ),
-					this.view.toolbar.items,
-					this.componentFactory
-				);
+				return this.view.toolbar.fillFromConfig( editor.config.get( 'toolbar' ), this.componentFactory );
 			} )
 			.then( () => {
 				enableToolbarKeyboardFocus( {

+ 4 - 8
packages/ckeditor5-editor-classic/tests/classiceditorui.js

@@ -13,7 +13,7 @@ import ClassicEditorUIView from '../src/classiceditoruiview';
 import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
 
 import FocusTracker from '@ckeditor/ckeditor5-utils/src/focustracker';
-import * as toolbarUtils from '@ckeditor/ckeditor5-ui/src/toolbar/utils';
+import * as enableToolbarKeyboardFocus from '@ckeditor/ckeditor5-ui/src/toolbar/enabletoolbarkeyboardfocus';
 
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 import utils from '@ckeditor/ckeditor5-utils/tests/_utils/utils';
@@ -139,19 +139,15 @@ describe( 'ClassicEditorUI', () => {
 		} );
 
 		it( 'fills view.toolbar#items with editor config', () => {
-			const spy = testUtils.sinon.spy( toolbarUtils, 'getItemsFromConfig' );
+			const spy = testUtils.sinon.spy( view.toolbar, 'fillFromConfig' );
 
 			return ui.init().then( () => {
-				sinon.assert.calledWithExactly( spy,
-					editor.config.get( 'toolbar' ),
-					view.toolbar.items,
-					ui.componentFactory
-				);
+				sinon.assert.calledWithExactly( spy, editor.config.get( 'toolbar' ), ui.componentFactory );
 			} );
 		} );
 
 		it( 'initializes keyboard navigation between view#toolbar and view#editable', () => {
-			const spy = testUtils.sinon.spy( toolbarUtils, 'enableToolbarKeyboardFocus' );
+			const spy = testUtils.sinon.spy( enableToolbarKeyboardFocus, 'default' );
 
 			return ui.init().then( () => {
 				sinon.assert.calledWithExactly( spy, {