Merge remote-tracking branch 'origin/imported-magento-magento2-31549' into 2.4-develop-pr119

zakdma · zakdma · commit a0fe3a24fc67 · 2021-01-13T14:08:30.000+02:00
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/date.js b/app/code/Magento/Ui/view/base/web/js/form/element/date.js
@@ -181,6 +181,7 @@ define([
                 this.pickerDateTimeFormat = this.options.timeFormat;
             } else {
                 this.pickerDateTimeFormat = this.options.dateFormat;
+
                 if (this.options.showsTime) {
                     this.pickerDateTimeFormat += ' ' + this.options.timeFormat;
                 }

Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,7 @@ define([`
`181`	`181`	`this.pickerDateTimeFormat = this.options.timeFormat;`
`182`	`182`	`} else {`
`183`	`183`	`this.pickerDateTimeFormat = this.options.dateFormat;`
	`184`	`+`
`184`	`185`	`if (this.options.showsTime) {`
`185`	`186`	`this.pickerDateTimeFormat += ' ' + this.options.timeFormat;`
`186`	`187`	`}`