Skip to content

Commit f1491b3

Browse files
committed
Merge branch 'MAGETWO-99832' of https://github.com/magento-tango/magento2ce into pr_2019_06_11_ce
2 parents ee69692 + b947c12 commit f1491b3

File tree

1 file changed

+4
-8
lines changed
  • app/code/Magento/Ui/view/base/web/js/form/element

1 file changed

+4
-8
lines changed

app/code/Magento/Ui/view/base/web/js/form/element/date.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,17 +125,13 @@ define([
125125
shiftedValue = moment(value, dateFormat);
126126
}
127127

128-
if (!shiftedValue.isValid()) {
129-
shiftedValue = moment(value, this.inputDateFormat);
130-
}
131128
shiftedValue = shiftedValue.format(this.pickerDateTimeFormat);
132-
} else {
133-
shiftedValue = '';
134-
}
135129

136-
if (shiftedValue !== this.shiftedValue()) {
137-
this.shiftedValue(shiftedValue);
130+
if (shiftedValue !== this.shiftedValue()) {
131+
this.shiftedValue(shiftedValue);
132+
}
138133
}
134+
139135
},
140136

141137
/**

0 commit comments

Comments
 (0)