diff --git a/aio/scripts/_payload-limits.json b/aio/scripts/_payload-limits.json index 6861676969..b02773aeef 100755 --- a/aio/scripts/_payload-limits.json +++ b/aio/scripts/_payload-limits.json @@ -3,7 +3,7 @@ "master": { "uncompressed": { "runtime": 2768, - "main": 475857, + "main": 475855, "polyfills": 38453, "prettify": 14913 } diff --git a/aio/src/app/app.component.spec.ts b/aio/src/app/app.component.spec.ts index 6431d9c79c..5b646af0a5 100644 --- a/aio/src/app/app.component.spec.ts +++ b/aio/src/app/app.component.spec.ts @@ -1306,7 +1306,7 @@ function createTestingModule(initialUrl: string, mode: string = 'stable') { } class TestElementsLoader { - loadContainingCustomElements = jasmine.createSpy('loadContainingCustomElements') + loadContainedCustomElements = jasmine.createSpy('loadContainedCustomElements') .and.returnValue(of(undefined)); loadCustomElement = jasmine.createSpy('loadCustomElement') diff --git a/aio/src/app/custom-elements/elements-loader.spec.ts b/aio/src/app/custom-elements/elements-loader.spec.ts index 906e74283e..817dd71a57 100644 --- a/aio/src/app/custom-elements/elements-loader.spec.ts +++ b/aio/src/app/custom-elements/elements-loader.spec.ts @@ -33,7 +33,7 @@ describe('ElementsLoader', () => { elementsLoader = injector.get(ElementsLoader); }); - describe('loadContainingCustomElements()', () => { + describe('loadContainedCustomElements()', () => { let loadCustomElementSpy: jasmine.Spy; beforeEach(() => loadCustomElementSpy = spyOn(elementsLoader, 'loadCustomElement')); @@ -47,7 +47,7 @@ describe('ElementsLoader', () => { `; - elementsLoader.loadContainingCustomElements(hostEl); + elementsLoader.loadContainedCustomElements(hostEl); flushMicrotasks(); expect(loadCustomElementSpy).toHaveBeenCalledTimes(2); @@ -63,7 +63,7 @@ describe('ElementsLoader', () => { `; - elementsLoader.loadContainingCustomElements(hostEl); + elementsLoader.loadContainedCustomElements(hostEl); flushMicrotasks(); expect(loadCustomElementSpy).toHaveBeenCalledTimes(1); @@ -80,7 +80,7 @@ describe('ElementsLoader', () => { `; const log: any[] = []; - elementsLoader.loadContainingCustomElements(hostEl).subscribe( + elementsLoader.loadContainedCustomElements(hostEl).subscribe( v => log.push(`emitted: ${v}`), e => log.push(`errored: ${e}`), () => log.push('completed'), @@ -108,7 +108,7 @@ describe('ElementsLoader', () => { `; const log: any[] = []; - elementsLoader.loadContainingCustomElements(hostEl).subscribe( + elementsLoader.loadContainedCustomElements(hostEl).subscribe( v => log.push(`emitted: ${v}`), e => log.push(`errored: ${e}`), () => log.push('completed'), diff --git a/aio/src/app/custom-elements/elements-loader.ts b/aio/src/app/custom-elements/elements-loader.ts index 0dd45a008d..8eef788c5b 100644 --- a/aio/src/app/custom-elements/elements-loader.ts +++ b/aio/src/app/custom-elements/elements-loader.ts @@ -26,7 +26,7 @@ export class ElementsLoader { * the browser. Custom elements that are registered will be removed from the list of unregistered * elements so that they will not be queried in subsequent calls. */ - loadContainingCustomElements(element: HTMLElement): Observable { + loadContainedCustomElements(element: HTMLElement): Observable { const unregisteredSelectors = Array.from(this.elementsToLoad.keys()) .filter(s => element.querySelector(s)); diff --git a/aio/src/app/custom-elements/lazy-custom-element.component.spec.ts b/aio/src/app/custom-elements/lazy-custom-element.component.spec.ts index 3e7c9a5fa5..5bb0eeefa5 100644 --- a/aio/src/app/custom-elements/lazy-custom-element.component.spec.ts +++ b/aio/src/app/custom-elements/lazy-custom-element.component.spec.ts @@ -11,7 +11,7 @@ describe('LazyCustomElementComponent', () => { beforeEach(() => { mockElementsLoader = jasmine.createSpyObj('ElementsLoader', [ - 'loadContainingCustomElements', + 'loadContainedCustomElements', 'loadCustomElement', ]); diff --git a/aio/src/app/layout/doc-viewer/doc-viewer.component.spec.ts b/aio/src/app/layout/doc-viewer/doc-viewer.component.spec.ts index 42ba737be3..1f1ae32a71 100644 --- a/aio/src/app/layout/doc-viewer/doc-viewer.component.spec.ts +++ b/aio/src/app/layout/doc-viewer/doc-viewer.component.spec.ts @@ -300,7 +300,7 @@ describe('DocViewerComponent', () => { beforeEach(() => { const elementsLoader = TestBed.get(ElementsLoader) as MockElementsLoader; - loadElementsSpy = elementsLoader.loadContainingCustomElements.and.returnValue(of(undefined)); + loadElementsSpy = elementsLoader.loadContainedCustomElements.and.returnValue(of(undefined)); prepareTitleAndTocSpy = spyOn(docViewer, 'prepareTitleAndToc'); swapViewsSpy = spyOn(docViewer, 'swapViews').and.returnValue(of(undefined)); }); diff --git a/aio/src/app/layout/doc-viewer/doc-viewer.component.ts b/aio/src/app/layout/doc-viewer/doc-viewer.component.ts index 26a4513c99..a1b5ddabb0 100644 --- a/aio/src/app/layout/doc-viewer/doc-viewer.component.ts +++ b/aio/src/app/layout/doc-viewer/doc-viewer.component.ts @@ -136,7 +136,7 @@ export class DocViewerComponent implements OnDestroy { // and is considered to be safe. tap(() => this.nextViewContainer.innerHTML = doc.contents || ''), tap(() => addTitleAndToc = this.prepareTitleAndToc(this.nextViewContainer, doc.id)), - switchMap(() => this.elementsLoader.loadContainingCustomElements(this.nextViewContainer)), + switchMap(() => this.elementsLoader.loadContainedCustomElements(this.nextViewContainer)), tap(() => this.docReady.emit()), switchMap(() => this.swapViews(addTitleAndToc)), tap(() => this.docRendered.emit()), diff --git a/aio/src/testing/doc-viewer-utils.ts b/aio/src/testing/doc-viewer-utils.ts index cc7a207805..a078e492ec 100644 --- a/aio/src/testing/doc-viewer-utils.ts +++ b/aio/src/testing/doc-viewer-utils.ts @@ -56,8 +56,8 @@ export class MockTocService { } export class MockElementsLoader { - loadContainingCustomElements = - jasmine.createSpy('MockElementsLoader#loadContainingCustomElements'); + loadContainedCustomElements = + jasmine.createSpy('MockElementsLoader#loadContainedCustomElements'); } @NgModule({