8
0
Просмотр исходного кода

Merge branch t/ckeditor5-ui/344

Internal: Aligned dropdowns usage to changed in the UI. See ckeditor/ckeditor5-ui#361.
Piotrek Koszuliński 8 лет назад
Родитель
Сommit
8b3f0e384b

+ 7 - 4
packages/ckeditor5-theme-lark/tests/manual/theme.js

@@ -13,8 +13,9 @@ import View from '@ckeditor/ckeditor5-ui/src/view';
 
 import IconView from '@ckeditor/ckeditor5-ui/src/icon/iconview';
 import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
-import createListDropdown from '@ckeditor/ckeditor5-ui/src/dropdown/list/createlistdropdown';
-import createButtonDropdown from '@ckeditor/ckeditor5-ui/src/dropdown/button/createbuttondropdown';
+
+import { createDropdown, addListToDropdown } from '@ckeditor/ckeditor5-ui/src/dropdown/utils';
+
 import ToolbarView from '@ckeditor/ckeditor5-ui/src/toolbar/toolbarview';
 import ToolbarSeparatorView from '@ckeditor/ckeditor5-ui/src/toolbar/toolbarseparatorview';
 import InputTextView from '@ckeditor/ckeditor5-ui/src/inputtext/inputtextview';
@@ -407,8 +408,10 @@ function listDropdown( {
 	withText = true,
 	items = new Collection( { idProperty: 'label' } )
 } = {} ) {
-	const model = new Model( { label, isEnabled, items, isOn, withText } );
-	const dropdown = createListDropdown( model, {} );
+	const dropdown = createDropdown( {} );
+	dropdown.set( { label, isEnabled, isOn, withText } );
+
+	addListToDropdown( dropdown, items );
 
 	return dropdown;
 }

+ 1 - 1
packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/dropdown/buttondropdown.css → packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/dropdown/toolbardropdown.css

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-.ck-buttondropdown .ck-toolbar {
+.ck-toolbar-dropdown .ck-toolbar {
 	border: 0;
 	padding: 0;