cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RendererV2 -> Renderer2 rename (#14998)

Browse Source 
* refactor: rename `RendererV2` into `Renderer2`

BREAKING CHANGE (since 4.0 rc.1):
- rename `RendererV2` to `Renderer2`
- rename `RendererTypeV2` to `RendererType2`
- rename `RendererFactoryV2` to `RendererFactory2`
This commit is contained in:
Tobias Bosch
2017-03-07 16:36:12 -08:00
committed by Chuck Jazdzewski
parent 5df998d086
commit ad3b44aef7
40 changed files with 230 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/@angular/platform-server/src/private_export.ts
View File

@ -8,4 +8,4 @@
export {INTERNAL_SERVER_PLATFORM_PROVIDERS as ɵINTERNAL_SERVER_PLATFORM_PROVIDERS, SERVER_RENDER_PROVIDERS as ɵSERVER_RENDER_PROVIDERS} from './server';
export {ServerRendererFactoryV2 as ɵServerRendererFactoryV2} from './server_renderer';
export {ServerRendererFactory2 as ɵServerRendererFactory2} from './server_renderer';

8
modules/@angular/platform-server/src/server.ts
View File

@ -8,7 +8,7 @@
import {PlatformLocation, ɵPLATFORM_SERVER_ID as PLATFORM_SERVER_ID} from '@angular/common';
import {platformCoreDynamic} from '@angular/compiler';
import {Injectable, InjectionToken, Injector, NgModule, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, Provider, RendererFactoryV2, RootRenderer, Testability, createPlatformFactory, isDevMode, platformCore, ɵALLOW_MULTIPLE_PLATFORMS as ALLOW_MULTIPLE_PLATFORMS} from '@angular/core';
import {Injectable, InjectionToken, Injector, NgModule, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, Provider, RendererFactory2, RootRenderer, Testability, createPlatformFactory, isDevMode, platformCore, ɵALLOW_MULTIPLE_PLATFORMS as ALLOW_MULTIPLE_PLATFORMS} from '@angular/core';
import {HttpModule} from '@angular/http';
import {BrowserModule, DOCUMENT, ɵSharedStylesHost as SharedStylesHost, ɵgetDOM as getDOM} from '@angular/platform-browser';
@ -16,7 +16,7 @@ import {SERVER_HTTP_PROVIDERS} from './http';
import {ServerPlatformLocation} from './location';
import {Parse5DomAdapter, parseDocument} from './parse5_adapter';
import {PlatformState} from './platform_state';
import {ServerRendererFactoryV2} from './server_renderer';
import {ServerRendererFactory2} from './server_renderer';
import {ServerStylesHost} from './styles_host';
import {INITIAL_CONFIG, PlatformConfig} from './tokens';
@ -38,8 +38,8 @@ function initParse5Adapter(injector: Injector) {
}
export const SERVER_RENDER_PROVIDERS: Provider[] = [
ServerRendererFactoryV2,
{provide: RendererFactoryV2, useExisting: ServerRendererFactoryV2},
ServerRendererFactory2,
{provide: RendererFactory2, useExisting: ServerRendererFactory2},
ServerStylesHost,
{provide: SharedStylesHost, useExisting: ServerStylesHost},
];

22
modules/@angular/platform-server/src/server_renderer.ts
View File

@ -7,24 +7,24 @@
*/
import {DomElementSchemaRegistry} from '@angular/compiler';
import {APP_ID, Inject, Injectable, NgZone, RenderComponentType, Renderer, RendererFactoryV2, RendererTypeV2, RendererV2, RootRenderer, ViewEncapsulation, ɵstringify as stringify} from '@angular/core';
import {APP_ID, Inject, Injectable, NgZone, RenderComponentType, Renderer, Renderer2, RendererFactory2, RendererType2, RootRenderer, ViewEncapsulation, ɵstringify as stringify} from '@angular/core';
import {DOCUMENT, ɵNAMESPACE_URIS as NAMESPACE_URIS, ɵSharedStylesHost as SharedStylesHost, ɵflattenStyles as flattenStyles, ɵgetDOM as getDOM, ɵshimContentAttribute as shimContentAttribute, ɵshimHostAttribute as shimHostAttribute} from '@angular/platform-browser';
const EMPTY_ARRAY: any[] = [];
@Injectable()
export class ServerRendererFactoryV2 implements RendererFactoryV2 {
private rendererByCompId = new Map<string, RendererV2>();
private defaultRenderer: RendererV2;
export class ServerRendererFactory2 implements RendererFactory2 {
private rendererByCompId = new Map<string, Renderer2>();
private defaultRenderer: Renderer2;
private schema = new DomElementSchemaRegistry();
constructor(
private ngZone: NgZone, @Inject(DOCUMENT) private document: any,
private sharedStylesHost: SharedStylesHost) {
this.defaultRenderer = new DefaultServerRendererV2(document, ngZone, this.schema);
this.defaultRenderer = new DefaultServerRenderer2(document, ngZone, this.schema);
};
createRenderer(element: any, type: RendererTypeV2): RendererV2 {
createRenderer(element: any, type: RendererType2): Renderer2 {
if (!element || !type) {
return this.defaultRenderer;
}
@ -32,11 +32,11 @@ export class ServerRendererFactoryV2 implements RendererFactoryV2 {
case ViewEncapsulation.Emulated: {
let renderer = this.rendererByCompId.get(type.id);
if (!renderer) {
renderer = new EmulatedEncapsulationServerRendererV2(
renderer = new EmulatedEncapsulationServerRenderer2(
this.document, this.ngZone, this.sharedStylesHost, this.schema, type);
this.rendererByCompId.set(type.id, renderer);
}
(<EmulatedEncapsulationServerRendererV2>renderer).applyToHost(element);
(<EmulatedEncapsulationServerRenderer2>renderer).applyToHost(element);
return renderer;
}
case ViewEncapsulation.Native:
@ -53,7 +53,7 @@ export class ServerRendererFactoryV2 implements RendererFactoryV2 {
}
}
class DefaultServerRendererV2 implements RendererV2 {
class DefaultServerRenderer2 implements Renderer2 {
data: {[key: string]: any} = Object.create(null);
constructor(
@ -181,13 +181,13 @@ function checkNoSyntheticProp(name: string, nameKind: string) {
}
}
class EmulatedEncapsulationServerRendererV2 extends DefaultServerRendererV2 {
class EmulatedEncapsulationServerRenderer2 extends DefaultServerRenderer2 {
private contentAttr: string;
private hostAttr: string;
constructor(
document: any, ngZone: NgZone, sharedStylesHost: SharedStylesHost,
schema: DomElementSchemaRegistry, private component: RendererTypeV2) {
schema: DomElementSchemaRegistry, private component: RendererType2) {
super(document, ngZone, schema);
const styles = flattenStyles(component.id, component.styles, []);
sharedStylesHost.addStyles(styles);