From d32c85c4f2b9892b4db34589874eaf24280010c7 Mon Sep 17 00:00:00 2001 From: Jason Bedard Date: Fri, 5 Oct 2018 01:14:15 -0700 Subject: [PATCH] fixup! fix(upgrade): properly destroy upgraded component elements and descendants --- packages/upgrade/src/common/angular1.ts | 7 ++----- packages/upgrade/test/dynamic/upgrade_spec.ts | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/upgrade/src/common/angular1.ts b/packages/upgrade/src/common/angular1.ts index bf93aacfbeb62..d11542889ef88 100644 --- a/packages/upgrade/src/common/angular1.ts +++ b/packages/upgrade/src/common/angular1.ts @@ -285,11 +285,8 @@ export const module: typeof angular.module = (prefix, dependencies?) => angular.module(prefix, dependencies); export const element: typeof angular.element = Object.assign( - (e: string | Element | Document | IAugmentedJQuery) => angular.element(e), - { - cleanData: (nodes: NodeList | Node[]) => angular.element.cleanData(nodes) - } -); + (e: string | Element | Document | IAugmentedJQuery) => angular.element(e), + {cleanData: (nodes: Node[] | NodeList) => angular.element.cleanData(nodes)}); export const resumeBootstrap: typeof angular.resumeBootstrap = () => angular.resumeBootstrap(); diff --git a/packages/upgrade/test/dynamic/upgrade_spec.ts b/packages/upgrade/test/dynamic/upgrade_spec.ts index 96c7a4d54c2bf..2544ed3dec262 100644 --- a/packages/upgrade/test/dynamic/upgrade_spec.ts +++ b/packages/upgrade/test/dynamic/upgrade_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ChangeDetectorRef, Component, Directive, EventEmitter, Input, NO_ERRORS_SCHEMA, NgModule, NgModuleFactory, NgZone, OnChanges, OnDestroy, Output, SimpleChange, SimpleChanges, Testability, destroyPlatform, forwardRef} from '@angular/core'; +import {ChangeDetectorRef, Component, EventEmitter, Input, NO_ERRORS_SCHEMA, NgModule, NgModuleFactory, NgZone, OnChanges, OnDestroy, Output, SimpleChange, SimpleChanges, Testability, destroyPlatform, forwardRef} from '@angular/core'; import {async, fakeAsync, flushMicrotasks, tick} from '@angular/core/testing'; import {BrowserModule} from '@angular/platform-browser'; import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';