Skip to content

Commit b45a1cb

Browse files
committed
fix: replace extendObject utility w/ object spread
BREAKING CHANGE: The `extendObject` utility function is removed.
1 parent 3571f68 commit b45a1cb

File tree

6 files changed

+3
-89
lines changed

6 files changed

+3
-89
lines changed

src/lib/core/datetime/native-date-adapter.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import {Inject, Injectable, Optional} from '@angular/core';
1010
import {DateAdapter, MAT_DATE_LOCALE} from './date-adapter';
11-
import {extendObject} from '../util/object-extend';
1211

1312
// TODO(mmalerba): Remove when we no longer support safari 9.
1413
/** Whether the browser supports the Intl API. */
@@ -179,7 +178,7 @@ export class NativeDateAdapter extends DateAdapter<Date> {
179178
date = new Date(Date.UTC(
180179
date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(),
181180
date.getMinutes(), date.getSeconds(), date.getMilliseconds()));
182-
displayFormat = extendObject({}, displayFormat, {timeZone: 'utc'});
181+
displayFormat = {...displayFormat, timeZone: 'utc'};
183182
}
184183
let dtf = new Intl.DateTimeFormat(this.locale, displayFormat);
185184
return this._stripDirectionalityCharacters(dtf.format(date));

src/lib/core/public_api.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export * from './placeholder/placeholder-options';
2020
export * from './ripple/index';
2121
export * from './selection/index';
2222
export * from './style/index';
23-
export * from './util/object-extend';
2423
export * from './mat-exports';
2524

2625
// TODO: don't have this

src/lib/core/util/object-extend.spec.ts

Lines changed: 0 additions & 50 deletions
This file was deleted.

src/lib/core/util/object-extend.ts

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/lib/dialog/dialog.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import {
2727
SkipSelf,
2828
TemplateRef,
2929
} from '@angular/core';
30-
import {extendObject} from '@angular/material/core';
3130
import {Observable} from 'rxjs/Observable';
3231
import {defer} from 'rxjs/observable/defer';
3332
import {Subject} from 'rxjs/Subject';
@@ -319,5 +318,5 @@ export class MdDialog {
319318
* @returns The new configuration object.
320319
*/
321320
function _applyConfigDefaults(config?: MdDialogConfig): MdDialogConfig {
322-
return extendObject(new MdDialogConfig(), config);
321+
return {...new MdDialogConfig(), ...config};
323322
}

src/lib/snack-bar/snack-bar.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {LiveAnnouncer} from '@angular/cdk/a11y';
1010
import {Overlay, OverlayConfig, OverlayRef} from '@angular/cdk/overlay';
1111
import {ComponentPortal, ComponentType, PortalInjector} from '@angular/cdk/portal';
1212
import {ComponentRef, Injectable, Injector, Optional, SkipSelf} from '@angular/core';
13-
import {extendObject} from '@angular/material/core';
1413
import {SimpleSnackBar} from './simple-snack-bar';
1514
import {MD_SNACK_BAR_DATA, MdSnackBarConfig} from './snack-bar-config';
1615
import {MdSnackBarContainer} from './snack-bar-container';
@@ -206,5 +205,5 @@ export class MdSnackBar {
206205
* @returns The new configuration object with defaults applied.
207206
*/
208207
function _applyConfigDefaults(config?: MdSnackBarConfig): MdSnackBarConfig {
209-
return extendObject(new MdSnackBarConfig(), config);
208+
return {...new MdSnackBarConfig(), ...config};
210209
}

0 commit comments

Comments
 (0)