fix(datepicker): reseting min and max boundaries will reset it in dat…

…epicker (#3112) fixes #3085
valor-software · Nov 27, 2017 · a72fedc · a72fedc
1 parent 60f8b31
commit a72fedc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/datepicker/bs-datepicker.component.ts b/src/datepicker/bs-datepicker.component.ts
@@ -207,8 +207,8 @@ export class BsDatepickerComponent implements OnInit, OnDestroy, OnChanges {
     this._config = Object.assign({}, this._config, this.bsConfig, {
       value: this._bsValue,
       isDisabled: this.isDisabled,
-      minDate: this.minDate || this._config.minDate,
-      maxDate: this.maxDate || this._config.maxDate
+      minDate: this.minDate || this.bsConfig && this.bsConfig.minDate,
+      maxDate: this.maxDate || this.bsConfig && this.bsConfig.maxDate
     });
   }
 

diff --git a/src/datepicker/bs-daterangepicker.component.ts b/src/datepicker/bs-daterangepicker.component.ts
@@ -188,8 +188,8 @@ export class BsDaterangepickerComponent
       {
         value: this._bsValue,
         isDisabled: this.isDisabled,
-        minDate: this.minDate || this._config.minDate,
-        maxDate: this.maxDate || this._config.maxDate
+        minDate: this.minDate || this.bsConfig && this.bsConfig.minDate,
+        maxDate: this.maxDate || this.bsConfig && this.bsConfig.maxDate
       }
     );
   }