cleanup(datepicker): undo breaking change to NativeDateAdapter (#8281)

angular · Nov 7, 2017 · 8b3c8a5 · 8b3c8a5
1 parent 998153a
commit 8b3c8a5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/lib/core/datetime/index.ts b/src/lib/core/datetime/index.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {PlatformModule} from '@angular/cdk/platform';
 import {NgModule} from '@angular/core';
 import {DateAdapter, MAT_DATE_LOCALE_PROVIDER} from './date-adapter';
 import {MAT_DATE_FORMATS} from './date-formats';
@@ -20,7 +19,6 @@ export * from './native-date-formats';
 
 
 @NgModule({
-  imports: [PlatformModule],
   providers: [
     {provide: DateAdapter, useClass: NativeDateAdapter},
     MAT_DATE_LOCALE_PROVIDER

diff --git a/src/lib/core/datetime/native-date-adapter.ts b/src/lib/core/datetime/native-date-adapter.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Platform} from '@angular/cdk/platform';
 import {Inject, Injectable, Optional} from '@angular/core';
 import {extendObject} from '../util/object-extend';
 import {DateAdapter, MAT_DATE_LOCALE} from './date-adapter';
@@ -69,12 +68,15 @@ export class NativeDateAdapter extends DateAdapter<Date> {
    */
   useUtcForDisplay: boolean;
 
-  constructor(@Optional() @Inject(MAT_DATE_LOCALE) matDateLocale: string, platform: Platform) {
+  constructor(@Optional() @Inject(MAT_DATE_LOCALE) matDateLocale: string) {
     super();
     super.setLocale(matDateLocale);
 
     // IE does its own time zone correction, so we disable this on IE.
-    this.useUtcForDisplay = !platform.TRIDENT;
+    // TODO(mmalerba): replace with !platform.TRIDENT, logic currently duplicated to avoid breaking
+    // change from injecting the Platform.
+    this.useUtcForDisplay = !(typeof document === 'object' && !!document &&
+        /(msie|trident)/i.test(navigator.userAgent));
   }
 
   getYear(date: Date): number {