Skip to content

Commit a30a283

Browse files
committed
fix(datepicker): fix daterangepicker crash on empty value
1 parent 6b7a8c4 commit a30a283

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

demo/src/app/components/+datepicker/demos/bs-popup/date-picker-popup.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<br>
1616

1717
<pre>{{bsRangeValue}}</pre>
18-
<pre>{{ bsRangeValue[0] | date:'yMd'}} - {{ bsRangeValue[1] | date:'yMd'}}</pre>
18+
<pre *ngIf="bsRangeValue">{{ bsRangeValue[0] | date:'yMd'}} - {{ bsRangeValue[1] | date:'yMd'}}</pre>
1919
<input #drp="bsDaterangepicker" bsDaterangepicker [(bsValue)]="bsRangeValue">
2020
<input bsDaterangepicker [(ngModel)]="bsRangeValue">
2121
<input [(ngModel)]="bsRangeValue">

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"demo.serve": "run-s build link demo.docs demo.build docs.archive lite-server",
1111
"demo.serve-fast": "run-s build link demo.docs demo.build-fast docs.archive lite-server",
1212
"demo.gh-pages": "run-s build demo.docs demo.build docs.archive demo.deploy",
13-
"demo.build": "ng build -prod --aot --build-optimizer --preserve-symlinks -nc",
13+
"demo.build": "ng build -prod --aot --preserve-symlinks -nc",
1414
"demo.build-fast": "ng build",
1515
"demo.deploy": "gh-pages -d gh-pages",
1616
"demo-beta-deploy": "gh-pages -d gh-pages -r git@github.com:valorkin/ngx-bootstrap.git -b gh-pages",

src/datepicker/bs-daterangepicker-input.directive.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ export class BsDaterangepickerInputDirective
3737
v[0],
3838
this._picker._config.rangeInputFormat,
3939
this._picker._config.locale
40-
);
40+
) || '';
4141
const end = formatDate(
4242
v[1],
4343
this._picker._config.rangeInputFormat,
4444
this._picker._config.locale
45-
);
46-
range = start + this._picker._config.rangeSeparator + end;
45+
) || '';
46+
range = (start && end) ? start + this._picker._config.rangeSeparator + end : '';
4747
}
4848
this._renderer.setProperty(this._elRef.nativeElement, 'value', range);
4949
this._onChange(v);
@@ -58,6 +58,7 @@ export class BsDaterangepickerInputDirective
5858
writeValue(value: Date[] | string) {
5959
if (!value) {
6060
this._picker.bsValue = null;
61+
return;
6162
}
6263

6364
const _locale = getLocale(this._picker._config.locale);

0 commit comments

Comments
 (0)