Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/datepicker/bs-datepicker-inline.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 5 additions & 3 deletions src/datepicker/bs-datepicker.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion src/datepicker/bs-daterangepicker-inline.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion src/datepicker/bs-daterangepicker.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export class BsDaterangepickerDirective
return;
}

if (value && this.bsConfig?.initCurrentTime) {
if (value && this._config?.initCurrentTime) {
value = setDateRangesCurrentTimeOnDateSelect(value);
}
this.initPreviousValue();
Expand Down