From d1efc5ae9004020934d8c59be0d574c62d6671fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matias=20Niemel=C3=A4?= Date: Wed, 13 Sep 2017 13:18:08 -0700 Subject: [PATCH] revert: fix(upgrade): remove code setting id attribute This reverts commit 1302e5494764f1d6e81842ef03f7b787bc57e50f. --- packages/upgrade/src/common/downgrade_component.ts | 8 +++++++- .../upgrade/src/common/downgrade_component_adapter.ts | 10 +++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/upgrade/src/common/downgrade_component.ts b/packages/upgrade/src/common/downgrade_component.ts index 95722f7d76..62d90fc2b7 100644 --- a/packages/upgrade/src/common/downgrade_component.ts +++ b/packages/upgrade/src/common/downgrade_component.ts @@ -13,6 +13,8 @@ import {$COMPILE, $INJECTOR, $PARSE, INJECTOR_KEY, REQUIRE_INJECTOR, REQUIRE_NG_ import {DowngradeComponentAdapter} from './downgrade_component_adapter'; import {controllerKey, getComponentName} from './util'; +let downgradeCount = 0; + /** * @whatItDoes * @@ -55,6 +57,9 @@ export function downgradeComponent(info: { /** @deprecated since v4. This parameter is no longer used */ selectors?: string[]; }): any /* angular.IInjectable */ { + const idPrefix = `NG2_UPGRADE_${downgradeCount++}_`; + let idCount = 0; + const directiveFactory: angular.IAnnotatedFunction = function( $compile: angular.ICompileService, @@ -85,9 +90,10 @@ export function downgradeComponent(info: { throw new Error('Expecting ComponentFactory for: ' + getComponentName(info.component)); } + const id = idPrefix + (idCount++); const injectorPromise = new ParentInjectorPromise(element); const facade = new DowngradeComponentAdapter( - element, attrs, scope, ngModel, injector, $injector, $compile, $parse, + id, element, attrs, scope, ngModel, injector, $injector, $compile, $parse, componentFactory); const projectableNodes = facade.compileContents(); diff --git a/packages/upgrade/src/common/downgrade_component_adapter.ts b/packages/upgrade/src/common/downgrade_component_adapter.ts index ede2efa28f..1d05dc151e 100644 --- a/packages/upgrade/src/common/downgrade_component_adapter.ts +++ b/packages/upgrade/src/common/downgrade_component_adapter.ts @@ -26,11 +26,11 @@ export class DowngradeComponentAdapter { private changeDetector: ChangeDetectorRef|null = null; constructor( - private element: angular.IAugmentedJQuery, private attrs: angular.IAttributes, - private scope: angular.IScope, private ngModel: angular.INgModelController, - private parentInjector: Injector, private $injector: angular.IInjectorService, - private $compile: angular.ICompileService, private $parse: angular.IParseService, - private componentFactory: ComponentFactory) { + private id: string, private element: angular.IAugmentedJQuery, + private attrs: angular.IAttributes, private scope: angular.IScope, + private ngModel: angular.INgModelController, private parentInjector: Injector, + private $injector: angular.IInjectorService, private $compile: angular.ICompileService, + private $parse: angular.IParseService, private componentFactory: ComponentFactory) { (this.element[0] as any).id = id; this.componentScope = scope.$new(); }