Skip to content

Commit

Permalink
fix(module: date-picker): fix no locale input will trigger error (#103)
Browse files Browse the repository at this point in the history
  • Loading branch information
Guoyuanqiang authored and 3fuyu committed Nov 13, 2018
1 parent 2265d9c commit db26f0f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion components/date-picker/date-picker.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ export class DatePickerComponent implements OnInit, OnDestroy, AfterViewInit {
} else {
this.data.push(tempArr);
}
if (this.options.locale.locale === 'zh_CN') {
if (this.options.locale === undefined || this.options.locale.locale === 'zh_CN') {
if (this.dataWithStr.length > idx && this.dataWithStr[idx].toString() !== dataWithStr.toString()) {
this.dataWithStr[idx] = dataWithStr;
} else if (this.dataWithStr.length > idx && this.dataWithStr[idx].toString() === dataWithStr.toString()) {
Expand Down

0 comments on commit db26f0f

Please sign in to comment.