From a3bfd532dbe8094f1c36a99e3683eee1f4168ea1 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Mon, 21 Nov 2016 15:32:01 +0000
Subject: [PATCH] #755 date picker fixes

fix and issue with opening a date picker after typing incorrect date
---
 .../src/components/widgets/date/date.widget.ts              | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 f6dba5b941..969211b94f 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
@@ -69,7 +69,11 @@ export class DateWidget extends WidgetComponent implements OnInit, AfterViewChec
 
     onDateChanged() {
         if (this.field.value) {
-            this.datePicker.time = moment(this.field.value, this.DATE_FORMAT);
+            let value = moment(this.field.value, this.DATE_FORMAT);
+            if (!value.isValid()) {
+                value = moment();
+            }
+            this.datePicker.time = value;
         }
         this.checkVisibility(this.field);
     }