diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.spec.ts index aa2fe2fdc9..2b9f4937dc 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.spec.ts @@ -114,7 +114,7 @@ describe('DateWidgetComponent', () => { widget.field = field; - widget.onDateChanged('12/12/2012'); + widget.onDateChanged({ value: moment('12/12/2012') }); expect(widget.checkVisibility).toHaveBeenCalledWith(field); }); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.ts index 75ebb22e07..e02a174005 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.ts @@ -60,7 +60,7 @@ export class DateWidgetComponent extends WidgetComponent implements OnInit { } } - this.displayDate = moment(this.field.value, this.field.dateDisplayFormat, true); + this.displayDate = moment(this.field.value, this.field.dateDisplayFormat); } @@ -68,13 +68,13 @@ export class DateWidgetComponent extends WidgetComponent implements OnInit { this.field.validationSummary = ''; if (newDateValue) { - let momentDate = moment(newDateValue, this.field.dateDisplayFormat, true); + let momentDate = newDateValue.value; if (!momentDate.isValid()) { this.field.validationSummary = this.field.dateDisplayFormat; this.field.value = null; } else { - this.field.value = newDateValue; - this.displayDate = moment(this.field.value, this.field.dateDisplayFormat, true); + this.field.value = momentDate; + this.displayDate = moment(this.field.value, this.field.dateDisplayFormat); } } else { this.field.value = null;