skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(native-date-adapter): remove hard-coded platform IE check (#9190)

Browse Source 
* Removes the hard-coded platform check for IE in the NativeDateAdapter.
This commit is contained in:
Paul Gschwendtner
2018-02-09 23:18:34 +01:00
committed by mmalerba
parent 3aceb7361c
commit ca37a7ff28
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/core/datetime/index.ts
+2
View File
@@ -6,6 +6,7 @@
* 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';
@@ -19,6 +20,7 @@ export * from './native-date-formats';
@NgModule({
imports: [PlatformModule],
providers: [
{provide: DateAdapter, useClass: NativeDateAdapter},
MAT_DATE_LOCALE_PROVIDER
src/lib/core/datetime/native-date-adapter.ts
+5 -9
View File
@@ -6,6 +6,7 @@
* found in the LICENSE file at https://angular.io/license
*/
import {Platform} from '@angular/cdk/platform';
import {Inject, Injectable, Optional} from '@angular/core';
import {DateAdapter, MAT_DATE_LOCALE} from './date-adapter';
@@ -67,20 +68,15 @@ export class NativeDateAdapter extends DateAdapter<Date> {
* the result. (e.g. in the en-US locale `new Date(1800, 7, 14).toLocaleDateString()`
* will produce `'8/13/1800'`.
*/
useUtcForDisplay: boolean;
useUtcForDisplay: boolean = true;
constructor(@Optional() @Inject(MAT_DATE_LOCALE) matDateLocale: string) {
constructor(@Optional() @Inject(MAT_DATE_LOCALE) matDateLocale: string, platform: Platform) {
super();
super.setLocale(matDateLocale);
// IE does its own time zone correction, so we disable this on IE.
// TODO(mmalerba): replace with checks from PLATFORM, logic currently duplicated to avoid
// breaking change from injecting the Platform.
const isBrowser = typeof document === 'object' && !!document;
const isIE = isBrowser && /(msie|trident)/i.test(navigator.userAgent);
this.useUtcForDisplay = !isIE;
this._clampDate = isIE || (isBrowser && /(edge)/i.test(navigator.userAgent));
this.useUtcForDisplay = !platform.TRIDENT;
this._clampDate = platform.TRIDENT || platform.EDGE;
}
getYear(date: Date): number {