diff --git a/src/datepicker/bs-datepicker-inline.component.ts b/src/datepicker/bs-datepicker-inline.component.ts index ba8f473b99..7436bf0933 100644 --- a/src/datepicker/bs-datepicker-inline.component.ts +++ b/src/datepicker/bs-datepicker-inline.component.ts @@ -99,14 +99,16 @@ export class BsDatepickerInlineDirective implements OnInit, OnDestroy, OnChanges return; } - if (!this._bsValue && value && !this._config.withTimepicker) { - const now = new Date(); - copyTime(value, now); - } + if (!this._bsValue && value && !this._config.withTimepicker) { + if (this._config.initCurrentTime) { + const now = new Date(); + copyTime(value, now); + } + } - if (value && this.bsConfig?.initCurrentTime) { + if (value && this._config?.initCurrentTime) { value = setCurrentTimeOnDateSelect(value); - } + } this._bsValue = value; this.bsValueChange.emit(value); diff --git a/src/datepicker/bs-datepicker.component.ts b/src/datepicker/bs-datepicker.component.ts index 599fbf9d84..9c44ffc738 100644 --- a/src/datepicker/bs-datepicker.component.ts +++ b/src/datepicker/bs-datepicker.component.ts @@ -156,11 +156,13 @@ export class BsDatepickerDirective implements OnInit, OnDestroy, OnChanges, Afte } if (!this._bsValue && value && !this._config.withTimepicker) { - const now = new Date(); - copyTime(value, now); + if (this._config.initCurrentTime) { + const now = new Date(); + copyTime(value, now); + } } - if (value && this.bsConfig?.initCurrentTime) { + if (value && this._config?.initCurrentTime) { value = setCurrentTimeOnDateSelect(value); } diff --git a/src/datepicker/bs-daterangepicker-inline.component.ts b/src/datepicker/bs-daterangepicker-inline.component.ts index 6d614d0677..1f9b55c8ed 100644 --- a/src/datepicker/bs-daterangepicker-inline.component.ts +++ b/src/datepicker/bs-daterangepicker-inline.component.ts @@ -36,7 +36,7 @@ export class BsDaterangepickerInlineDirective implements OnInit, OnDestroy, OnCh return; } - if (value && this.bsConfig?.initCurrentTime) { + if (value && this._config?.initCurrentTime) { value = setDateRangesCurrentTimeOnDateSelect(value); } diff --git a/src/datepicker/bs-daterangepicker.component.ts b/src/datepicker/bs-daterangepicker.component.ts index 5e8d79cac1..fa0ef693dc 100644 --- a/src/datepicker/bs-daterangepicker.component.ts +++ b/src/datepicker/bs-daterangepicker.component.ts @@ -84,7 +84,7 @@ export class BsDaterangepickerDirective return; } - if (value && this.bsConfig?.initCurrentTime) { + if (value && this._config?.initCurrentTime) { value = setDateRangesCurrentTimeOnDateSelect(value); } this.initPreviousValue();