Explorar o código

Add support for labels.

Mateusz Samsel %!s(int64=6) %!d(string=hai) anos
pai
achega
3e63a582f8

+ 2 - 2
packages/ckeditor5-font/src/fontbackgroundcolor/fontbackgroundcolorui.js

@@ -29,7 +29,7 @@ export default class FontBackgroundColorUI extends Plugin {
 			const colorTableView = colorUI.addColorsToDropdown(
 				dropdownView,
 				options.map( element => ( {
-					name: element.label,
+					label: element.label,
 					color: element.model,
 					options: {
 						hasBorder: element.hasBorder
@@ -56,7 +56,7 @@ export default class FontBackgroundColorUI extends Plugin {
 
 			dropdownView.on( 'execute', ( evt, val ) => {
 				if ( val.value !== null ) {
-					colorTableView.recentlyUsedColors.add( { color: val.value, hasBorder: val.hasBorder }, 0 );
+					colorTableView.recentlyUsedColors.add( { color: val.value, hasBorder: val.hasBorder, label: val.label }, 0 );
 				}
 				editor.execute( FONT_BACKGROUND_COLOR, val );
 				editor.editing.view.focus();

+ 2 - 2
packages/ckeditor5-font/src/fontcolor/fontcolorui.js

@@ -29,7 +29,7 @@ export default class FontColorUI extends Plugin {
 			const colorTableView = colorUI.addColorsToDropdown(
 				dropdownView,
 				options.map( element => ( {
-					name: element.label,
+					label: element.label,
 					color: element.model,
 					options: {
 						hasBorder: element.hasBorder
@@ -56,7 +56,7 @@ export default class FontColorUI extends Plugin {
 
 			dropdownView.on( 'execute', ( evt, val ) => {
 				if ( val.value !== null ) {
-					colorTableView.recentlyUsedColors.add( { color: val.value, hasBorder: val.hasBorder }, 0 );
+					colorTableView.recentlyUsedColors.add( { color: val.value, hasBorder: val.hasBorder, label: val.label }, 0 );
 				}
 				editor.execute( FONT_COLOR, val );
 				editor.editing.view.focus();

+ 3 - 1
packages/ckeditor5-font/src/ui/colorgrid.js

@@ -21,10 +21,12 @@ export default class ColorGrid extends View {
 			const colorTile = new ColorTile();
 			colorTile.set( {
 				color: item.color,
+				label: item.label,
+				tooltip: true,
 				hasBorder: item.options.hasBorder
 			} );
 			colorTile.on( 'execute', () => {
-				this.fire( 'execute', { value: item.color, hasBorder: item.options.hasBorder } );
+				this.fire( 'execute', { value: item.color, hasBorder: item.options.hasBorder, label: item.label } );
 			} );
 			this.items.add( colorTile );
 		} );

+ 7 - 1
packages/ckeditor5-font/src/ui/colortableview.js

@@ -91,11 +91,17 @@ export default class ColorTableView extends View {
 					color: colorObj.color,
 					hasBorder: colorObj.hasBorder
 				} );
+				if ( colorObj.label ) {
+					colorTile.set( {
+						label: colorObj.label,
+						tooltip: true
+					} );
+				}
 				if ( colorObj.isEnabled === false ) {
 					colorTile.set( 'isEnabled', false );
 				}
 				colorTile.on( 'execute', () => {
-					this.fire( 'execute', { value: colorObj.color, hasBorder: colorObj.hasBorder } );
+					this.fire( 'execute', { value: colorObj.color, hasBorder: colorObj.hasBorder, label: colorObj.label } );
 				} );
 				return colorTile;
 			}