From 1e139d43395b7e17cae75405b023e97d39dc8fa7 Mon Sep 17 00:00:00 2001 From: Pawel Kozlowski Date: Thu, 21 Jun 2018 11:49:03 +0200 Subject: [PATCH] refactor(ivy): rename, limit usage of global vars (#24604) PR Close #24604 --- packages/core/src/render3/instructions.ts | 15 ++++++++++----- .../hello_world/bundle.golden_symbols.json | 2 +- .../test/bundling/todo/bundle.golden_symbols.json | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts index 390203239d..3f2b19c279 100644 --- a/packages/core/src/render3/instructions.ts +++ b/packages/core/src/render3/instructions.ts @@ -234,15 +234,16 @@ export function leaveView(newView: LViewData, creationOnly?: boolean): void { /** * Refreshes the view, executing the following steps in that order: - * triggers init hooks, refreshes dynamic children, triggers content hooks, sets host bindings, + * triggers init hooks, refreshes dynamic embedded views, triggers content hooks, sets host + * bindings, * refreshes child components. * Note: view hooks are triggered later when leaving the view. - * */ + */ function refreshView() { if (!checkNoChangesMode) { executeInitHooks(viewData, tView, creationMode); } - refreshDynamicChildren(); + refreshDynamicEmbeddedViews(viewData); if (!checkNoChangesMode) { executeHooks(directives !, tView.contentHooks, tView.contentCheckHooks, creationMode); } @@ -1679,8 +1680,12 @@ export function containerRefreshEnd(): void { } } -function refreshDynamicChildren() { - for (let current = getLViewChild(viewData); current !== null; current = current[NEXT]) { +/** + * Goes over dynamic embedded views (ones created through ViewContainerRef APIs) and refreshes them + * by executing an associated template function. + */ +function refreshDynamicEmbeddedViews(lViewData: LViewData) { + for (let current = getLViewChild(lViewData); current !== null; current = current[NEXT]) { // Note: current can be an LViewData or an LContainer instance, but here we are only interested // in LContainer. We can tell it's an LContainer because its length is less than the LViewData // header. diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json index 3b45ff5977..6bb70e8f53 100644 --- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json +++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json @@ -195,7 +195,7 @@ "name": "refreshChildComponents" }, { - "name": "refreshDynamicChildren" + "name": "refreshDynamicEmbeddedViews" }, { "name": "refreshView" diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json index 03d1fc5334..737f86ebae 100644 --- a/packages/core/test/bundling/todo/bundle.golden_symbols.json +++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json @@ -468,7 +468,7 @@ "name": "refreshChildComponents" }, { - "name": "refreshDynamicChildren" + "name": "refreshDynamicEmbeddedViews" }, { "name": "refreshView"