address comments

Author: mmalerba

src/lib/datepicker/calendar.spec.ts

@@ -126,7 +126,7 @@ describe('MatCalendar', () => {
       expect(calendarInstance._currentView).toBe('multi-year');
       expect(calendarInstance._activeDate).toEqual(new Date(2017, JAN, 31));
 
-      (<HTMLElement>calendarElement.querySelector('.mat-calendar-body-active')).click();
+      (calendarElement.querySelector('.mat-calendar-body-active') as HTMLElement).click();
       fixture.detectChanges();
 
       expect(calendarInstance._currentView).toBe('year');
@@ -168,7 +168,7 @@ describe('MatCalendar', () => {
       expect(calendarInstance._activeDate).toEqual(new Date(2017, JAN, 31));
 
       let yearCells = calendarElement.querySelectorAll('.mat-calendar-body-cell');
-      (<HTMLElement>yearCells[0]).click();
+      (yearCells[0] as HTMLElement).click();
       fixture.detectChanges();
 
       expect(calendarInstance._currentView).toBe('year');
@@ -345,7 +345,7 @@ describe('MatCalendar', () => {
 
             expect(calendarInstance._currentView).toBe('multi-year');
 
-            (<HTMLElement>calendarBodyEl.querySelector('.mat-calendar-body-active')).click();
+            (calendarBodyEl.querySelector('.mat-calendar-body-active') as HTMLElement).click();
             fixture.detectChanges();
 
             expect(calendarInstance._currentView).toBe('year');
@@ -713,7 +713,7 @@ describe('MatCalendar', () => {
       periodButton.click();
       fixture.detectChanges();
 
-      (<HTMLElement>calendarElement.querySelector('.mat-calendar-body-active')).click();
+      (calendarElement.querySelector('.mat-calendar-body-active') as HTMLElement).click();
       fixture.detectChanges();
 
       spyOn(calendarInstance.yearView, '_init').and.callThrough();
@@ -731,7 +731,7 @@ describe('MatCalendar', () => {
       periodButton.click();
       fixture.detectChanges();
 
-      (<HTMLElement>calendarElement.querySelector('.mat-calendar-body-active')).click();
+      (calendarElement.querySelector('.mat-calendar-body-active') as HTMLElement).click();
       fixture.detectChanges();
 
       spyOn(calendarInstance.yearView, '_init').and.callThrough();
@@ -829,7 +829,7 @@ describe('MatCalendar', () => {
         dispatchMouseEvent(periodButton, 'click');
         fixture.detectChanges();
 
-        (<HTMLElement>calendarElement.querySelector('.mat-calendar-body-active')).click();
+        (calendarElement.querySelector('.mat-calendar-body-active') as HTMLElement).click();
         fixture.detectChanges();
 
         calendarInstance._activeDate = new Date(2017, NOV, 1);

src/lib/datepicker/calendar.ts

@@ -297,7 +297,7 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {
   private _isSameView(date1: D, date2: D): boolean {
     if (this._currentView == 'month') {
       return this._dateAdapter.getYear(date1) == this._dateAdapter.getYear(date2) &&
-          this._dateAdapter.getMonth(date1) == this._dateAdapter.getMonth(date2)
+          this._dateAdapter.getMonth(date1) == this._dateAdapter.getMonth(date2);
     }
     if (this._currentView == 'year') {
       return this._dateAdapter.getYear(date1) == this._dateAdapter.getYear(date2);
@@ -449,24 +449,6 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {
     event.preventDefault();
   }
 
-  /**
-   * Determine the date for the month that comes before the given month in the same column in the
-   * calendar table.
-   */
-  private _prevMonthInSameCol(date: D): D {
-    // Decrement by 4 since there are 4 months per row.
-    return this._dateAdapter.addCalendarMonths(date, -4);
-  }
-
-  /**
-   * Determine the date for the month that comes after the given month in the same column in the
-   * calendar table.
-   */
-  private _nextMonthInSameCol(date: D): D {
-    // Increment by 4 since there are 4 months per row.
-    return this._dateAdapter.addCalendarMonths(date, 4);
-  }
-
   /**
    * @param obj The object to check.
    * @returns The given object if it is both a date instance and valid, otherwise null.