浏览代码

Changed: Change how dropdowns with `ButtonView` and `SplitButtonView` are created.

Maciej Gołaszewski 7 年之前
父节点
当前提交
89207de8df
共有 2 个文件被更改,包括 2 次插入5 次删除
  1. 2 4
      packages/ckeditor5-alignment/src/alignmentui.js
  2. 0 1
      packages/ckeditor5-alignment/tests/alignmentui.js

+ 2 - 4
packages/ckeditor5-alignment/src/alignmentui.js

@@ -16,10 +16,9 @@ import getBindingTargets from '@ckeditor/ckeditor5-ui/src/bindings/getbindingtar
 import addToolbarToDropdown from '@ckeditor/ckeditor5-ui/src/dropdown/helpers/addtoolbartodropdown';
 import closeDropdownOnBlur from '@ckeditor/ckeditor5-ui/src/dropdown/helpers/closedropdownonblur';
 import closeDropdownOnExecute from '@ckeditor/ckeditor5-ui/src/dropdown/helpers/closedropdownonexecute';
-import createButtonForDropdown from '@ckeditor/ckeditor5-ui/src/dropdown/helpers/createbuttonfordropdown';
-import createDropdownView from '@ckeditor/ckeditor5-ui/src/dropdown/helpers/createdropdownview';
 import enableModelIfOneIsEnabled from '@ckeditor/ckeditor5-ui/src/dropdown/helpers/enablemodelifoneisenabled';
 import focusDropdownContentsOnArrows from '@ckeditor/ckeditor5-ui/src/dropdown/helpers/focusdropdowncontentsonarrows';
+import { createDropdown } from '@ckeditor/ckeditor5-ui/src/dropdown/utils';
 
 import { commandNameFromOptionName } from './alignmentcommand';
 import { isSupported } from './alignmentediting';
@@ -125,8 +124,7 @@ export default class AlignmentUI extends Plugin {
 			// Add specialised behavior
 			enableModelIfOneIsEnabled( dropdownModel, dropdownModel.buttons );
 
-			const buttonView = createButtonForDropdown( dropdownModel, locale );
-			const dropdownView = createDropdownView( dropdownModel, buttonView, locale );
+			const dropdownView = createDropdown( dropdownModel, locale );
 
 			addToolbarToDropdown( dropdownView, dropdownModel );
 			closeDropdownOnBlur( dropdownView );

+ 0 - 1
packages/ckeditor5-alignment/tests/alignmentui.js

@@ -221,7 +221,6 @@ describe( 'Alignment UI', () => {
 		it( '#toolbarView has the base properties', () => {
 			const toolbarView = dropdown.toolbarView;
 
-			expect( toolbarView ).to.have.property( 'className', 'ck-editor-toolbar' );
 			expect( toolbarView ).to.have.property( 'isVertical', true );
 		} );