Parcourir la source

Update dropdown with toolbar to reflect changes made in toolbarview.

Mateusz Samsel il y a 6 ans
Parent
commit
21c2667e12

+ 6 - 1
packages/ckeditor5-ui/src/dropdown/utils.js

@@ -123,13 +123,18 @@ export function createDropdown( locale, ButtonClass = DropdownButtonView ) {
  *		dropdown.render()
  *		dropdown.render()
  *		document.body.appendChild( dropdown.element );
  *		document.body.appendChild( dropdown.element );
  *
  *
+ * **Please note:** {@link module:ui/toolbar/toolbarview~ToolbarView ToolbarView} instance created for this dropdown has obligatory
+ * {@link module:utils/locale~Locale} argument. This why passed dropdownView has to have defined locale as well.
+ *
  * See {@link module:ui/dropdown/utils~createDropdown} and {@link module:ui/toolbar/toolbarview~ToolbarView}.
  * See {@link module:ui/dropdown/utils~createDropdown} and {@link module:ui/toolbar/toolbarview~ToolbarView}.
  *
  *
  * @param {module:ui/dropdown/dropdownview~DropdownView} dropdownView A dropdown instance to which `ToolbarView` will be added.
  * @param {module:ui/dropdown/dropdownview~DropdownView} dropdownView A dropdown instance to which `ToolbarView` will be added.
  * @param {Iterable.<module:ui/button/buttonview~ButtonView>} buttons
  * @param {Iterable.<module:ui/button/buttonview~ButtonView>} buttons
  */
  */
 export function addToolbarToDropdown( dropdownView, buttons ) {
 export function addToolbarToDropdown( dropdownView, buttons ) {
-	const toolbarView = dropdownView.toolbarView = new ToolbarView();
+	const locale = dropdownView.locale;
+	const t = locale.t;
+	const toolbarView = dropdownView.toolbarView = new ToolbarView( locale, { ariaLabel: t( 'Dropdown toolbar' ) } );
 
 
 	dropdownView.extendTemplate( {
 	dropdownView.extendTemplate( {
 		attributes: {
 		attributes: {

+ 1 - 1
packages/ckeditor5-ui/tests/dropdown/manual/dropdown.js

@@ -93,7 +93,7 @@ function testLongLabel() {
 }
 }
 
 
 function testToolbar() {
 function testToolbar() {
-	const locale = {};
+	const locale = { t: langString => langString };
 
 
 	const icons = { left: alignLeftIcon, right: alignRightIcon, center: alignCenterIcon };
 	const icons = { left: alignLeftIcon, right: alignRightIcon, center: alignCenterIcon };
 
 

+ 1 - 1
packages/ckeditor5-ui/tests/dropdown/utils.js

@@ -27,7 +27,7 @@ describe( 'utils', () => {
 	let locale, dropdownView;
 	let locale, dropdownView;
 
 
 	beforeEach( () => {
 	beforeEach( () => {
-		locale = { t() {} };
+		locale = { t: langString => langString };
 	} );
 	} );
 
 
 	describe( 'createDropdown()', () => {
 	describe( 'createDropdown()', () => {