Browse Source

UI: Fixed cancel event on color picker

pull/5813/head
ArtemDzhereleiko 5 years ago
parent
commit
fa1cd21473
  1. 2
      ui-ngx/src/app/shared/components/dialog/color-picker-dialog.component.ts
  2. 2
      ui-ngx/src/app/shared/components/json-form/json-form.component.ts

2
ui-ngx/src/app/shared/components/dialog/color-picker-dialog.component.ts

@ -67,7 +67,7 @@ export class ColorPickerDialogComponent extends DialogComponent<ColorPickerDialo
}
cancel(): void {
this.dialogRef.close(this.data.color);
this.dialogRef.close(null);
}
select(): void {

2
ui-ngx/src/app/shared/components/json-form/json-form.component.ts

@ -217,7 +217,7 @@ export class JsonFormComponent implements OnInit, ControlValueAccessor, Validato
val: tinycolor.ColorFormats.RGBA,
colorSelectedFn: (color: tinycolor.ColorFormats.RGBA) => void) {
this.dialogs.colorPicker(tinycolor(val).toRgbString()).subscribe((color) => {
if (colorSelectedFn) {
if (color && colorSelectedFn) {
colorSelectedFn(tinycolor(color).toRgb());
}
});

Loading…
Cancel
Save