fixing b-278

vlio20 · Nov 2, 2017 · 5bfe724 · 5bfe724
1 parent bd5fdf4
commit 5bfe724
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/e2e/daytimepicker-e2e.spec.ts b/e2e/daytimepicker-e2e.spec.ts
@@ -1,4 +1,5 @@
 import {DemoPage} from './app.po';
+import {browser} from 'protractor';
 
 describe('dpDayPicker daytimePicker', () => {
   let page: DemoPage;
@@ -61,4 +62,14 @@ describe('dpDayPicker daytimePicker', () => {
     expect(page.meridiemUpBtn.getAttribute('disabled')).toBe('true');
     expect(page.meridiemDownBtn.getAttribute('disabled')).toBe('true');
   });
+
+  it('should check that the max selectable option is working', () => {
+    page.daytimePickerInput.click();
+    page.daytimePickerInput.sendKeys('11-04-2017 09:08:07');
+    expect(page.selectedDays.count()).toEqual(1);
+    page.daytimePickerInput.clear();
+    page.daytimePickerInput.sendKeys(' ');
+
+    expect(page.selectedDays.count()).toEqual(0);
+  });
 });
diff --git a/src/app/day-calendar/day-calendar.component.ts b/src/app/day-calendar/day-calendar.component.ts
@@ -157,13 +157,14 @@ export class DayCalendarComponent implements OnInit, OnChanges, ControlValueAcce
     if (value) {
       this.selected = this.utilsService
         .convertToMomentArray(value, this.componentConfig.format, this.componentConfig.allowMultiSelect);
-      this.weeks = this.dayCalendarService
-        .generateMonthArray(this.componentConfig, this.currentDateView, this.selected);
       this.inputValueType = this.utilsService
         .getInputType(this.inputValue, this.componentConfig.allowMultiSelect);
     } else {
       this.selected = [];
     }
+
+    this.weeks = this.dayCalendarService
+      .generateMonthArray(this.componentConfig, this.currentDateView, this.selected);
   }
 
   registerOnChange(fn: any): void {