refactor(render): rename RenderView and RenderProtoView

Part of angular#1675 Closes angular#1705

Author: tbosch

modules/angular2/src/render/api.js

@@ -131,10 +131,10 @@ export class DirectiveMetadata {
  }
 }
 
-// An opaque reference to a RenderProtoView
+// An opaque reference to a DomProtoView
 export class RenderProtoViewRef {}
 
-// An opaque reference to a RenderView
+// An opaque reference to a DomView
 export class RenderViewRef {}
 
 export class RenderViewContainerRef {
@@ -175,7 +175,7 @@ export class RenderCompiler {
  createImperativeComponentProtoView(rendererId):Promise<ProtoViewDto> { return null; }
 
  /**
- * Compiles a single RenderProtoView. Non recursive so that
+ * Compiles a single DomProtoView. Non recursive so that
  * we don't need to serialize all possible components over the wire,
  * but only the needed ones based on previous calls.
  */
@@ -186,7 +186,7 @@ export class RenderCompiler {
  * which will be instantiated when this protoView is instantiated.
  * Note: We can't create new ProtoViewRefs here as we need to support cycles / recursive components.
  * @param {List<RenderProtoViewRef>} protoViewRefs
- * RenderProtoView for every element with a component in this protoView or in a view container's protoView
+ * DomProtoView for every element with a component in this protoView or in a view container's protoView
  */
  mergeChildComponentProtoViews(protoViewRef:RenderProtoViewRef, componentProtoViewRefs:List<RenderProtoViewRef>) { return null; }
 }
@@ -259,7 +259,7 @@ export class Renderer {
  /**
  * This will set the value for a text node.
  * Note: This needs to be separate from setElementProperty as we don't have ElementBinders
- * for text nodes in the RenderProtoView either.
+ * for text nodes in the DomProtoView either.
  */
  setText(view:RenderViewRef, textNodeIndex:number, text:string):void {}
 

modules/angular2/src/render/dom/direct_dom_renderer.js

@@ -4,8 +4,8 @@ import {List, ListWrapper} from 'angular2/src/facade/collection';
 import {isBlank, isPresent, BaseException} from 'angular2/src/facade/lang';
 
 import * as api from '../api';
-import {RenderView} from './view/view';
-import {RenderProtoView} from './view/proto_view';
+import {DomView} from './view/view';
+import {DomProtoView} from './view/proto_view';
 import {ViewFactory} from './view/view_factory';
 import {RenderViewHydrator} from './view/view_hydrator';
 import {ShadowDomStrategy} from './shadow_dom/shadow_dom_strategy';
@@ -23,7 +23,7 @@ function _resolveProtoView(protoViewRef:DirectDomProtoViewRef) {
  return isPresent(protoViewRef) ? protoViewRef.delegate : null;
 }
 
-function _wrapView(view:RenderView) {
+function _wrapView(view:DomView) {
  return new DirectDomViewRef(view);
 }
 
@@ -44,18 +44,18 @@ function _collectComponentChildViewRefs(view, target = null) {
 
 // public so that the compiler can use it.
 export class DirectDomProtoViewRef extends api.RenderProtoViewRef {
- delegate:RenderProtoView;
+ delegate:DomProtoView;
 
- constructor(delegate:RenderProtoView) {
+ constructor(delegate:DomProtoView) {
  super();
  this.delegate = delegate;
  }
 }
 
 export class DirectDomViewRef extends api.RenderViewRef {
- delegate:RenderView;
+ delegate:DomView;
 
- constructor(delegate:RenderView) {
+ constructor(delegate:DomView) {
  super();
  this.delegate = delegate;
  }

modules/angular2/src/render/dom/shadow_dom/emulated_unscoped_shadow_dom_strategy.js

@@ -33,11 +33,11 @@ export class EmulatedUnscopedShadowDomStrategy extends ShadowDomStrategy {
  return false;
  }
 
- attachTemplate(el, view:viewModule.RenderView) {
+ attachTemplate(el, view:viewModule.DomView) {
  moveViewNodesIntoParent(el, view);
  }
 
- constructLightDom(lightDomView:viewModule.RenderView, shadowDomView:viewModule.RenderView, el): LightDom {
+ constructLightDom(lightDomView:viewModule.DomView, shadowDomView:viewModule.DomView, el): LightDom {
  return new LightDom(lightDomView, shadowDomView, el);
  }
 

modules/angular2/src/render/dom/shadow_dom/light_dom.js

@@ -21,14 +21,14 @@ class _Root {
 // once interfaces are supported
 export class LightDom {
  // The light DOM of the element is enclosed inside the lightDomView
- lightDomView:viewModule.RenderView;
+ lightDomView:viewModule.DomView;
  // The shadow DOM
- shadowDomView:viewModule.RenderView;
+ shadowDomView:viewModule.DomView;
  // The nodes of the light DOM
  nodes:List;
  roots:List<_Root>;
 
- constructor(lightDomView:viewModule.RenderView, shadowDomView:viewModule.RenderView, element) {
+ constructor(lightDomView:viewModule.DomView, shadowDomView:viewModule.DomView, element) {
  this.lightDomView = lightDomView;
  this.shadowDomView = shadowDomView;
  this.nodes = DOM.childNodesAsList(element);
@@ -45,7 +45,7 @@ export class LightDom {
  }
 
  // Collects the Content directives from the view and all its child views
- _collectAllContentTags(view: viewModule.RenderView, acc:List<Content>):List<Content> {
+ _collectAllContentTags(view: viewModule.DomView, acc:List<Content>):List<Content> {
  var contentTags = view.contentTags;
  var vcs = view.viewContainers;
  for (var i=0; i<vcs.length; i++) {

modules/angular2/src/render/dom/shadow_dom/native_shadow_dom_strategy.js

@@ -22,7 +22,7 @@ export class NativeShadowDomStrategy extends ShadowDomStrategy {
  this.styleUrlResolver = styleUrlResolver;
  }
 
- attachTemplate(el, view:viewModule.RenderView){
+ attachTemplate(el, view:viewModule.DomView){
  moveViewNodesIntoParent(DOM.createShadowRoot(el), view);
  }
 

modules/angular2/src/render/dom/shadow_dom/shadow_dom_strategy.js

@@ -9,9 +9,9 @@ export class ShadowDomStrategy {
  return true;
  }
 
- attachTemplate(el, view:viewModule.RenderView) {}
+ attachTemplate(el, view:viewModule.DomView) {}
 
- constructLightDom(lightDomView:viewModule.RenderView, shadowDomView:viewModule.RenderView, el): LightDom {
+ constructLightDom(lightDomView:viewModule.DomView, shadowDomView:viewModule.DomView, el): LightDom {
  return null;
  }
 

modules/angular2/src/render/dom/view/element_binder.js

@@ -7,7 +7,7 @@ import * as protoViewModule from './proto_view';
 export class ElementBinder {
  contentTagSelector: string;
  textNodeIndices: List<number>;
- nestedProtoView: protoViewModule.RenderProtoView;
+ nestedProtoView: protoViewModule.DomProtoView;
  eventLocals: AST;
  localEvents: List<Event>;
  globalEvents: List<Event>;

modules/angular2/src/render/dom/view/proto_view.js

@@ -6,7 +6,7 @@ import {List, Map, ListWrapper, MapWrapper} from 'angular2/src/facade/collection
 import {ElementBinder} from './element_binder';
 import {NG_BINDING_CLASS} from '../util';
 
-export class RenderProtoView {
+export class DomProtoView {
  element;
  elementBinders:List<ElementBinder>;
  isTemplateElement:boolean;
@@ -30,7 +30,7 @@ export class RenderProtoView {
  }
  }
 
- mergeChildComponentProtoViews(componentProtoViews:List<RenderProtoView>) {
+ mergeChildComponentProtoViews(componentProtoViews:List<DomProtoView>) {
  var componentProtoViewIndex = 0;
  for (var i=0; i<this.elementBinders.length; i++) {
  var eb = this.elementBinders[i];

modules/angular2/src/render/dom/view/proto_view_builder.js

@@ -6,7 +6,7 @@ import {
  ASTWithSource, AST, AstTransformer, AccessMember, LiteralArray, ImplicitReceiver
 } from 'angular2/change_detection';
 
-import {RenderProtoView} from './proto_view';
+import {DomProtoView} from './proto_view';
 import {ElementBinder, Event} from './element_binder';
 import {setterFactory} from './property_setter_factory';
 
@@ -43,7 +43,7 @@ export class ProtoViewBuilder {
 
  bindVariable(name, value) {
  // Store the variable map from value to variable, reflecting how it will be used later by
- // RenderView. When a local is set to the view, a lookup for the variable name will take place keyed
+ // DomView. When a local is set to the view, a lookup for the variable name will take place keyed
  // by the "value", or exported identifier. For example, ng-repeat sets a view local of "index".
  // When this occurs, a lookup keyed by "index" must occur to find if there is a var referencing
  // it.
@@ -102,7 +102,7 @@ export class ProtoViewBuilder {
  }));
  });
  return new api.ProtoViewDto({
- render: new directDomRenderer.DirectDomProtoViewRef(new RenderProtoView({
+ render: new directDomRenderer.DirectDomProtoViewRef(new DomProtoView({
  element: this.rootElement,
  elementBinders: renderElementBinders,
  imperativeRendererId: this.imperativeRendererId
@@ -192,7 +192,7 @@ export class ElementBinderBuilder {
  this.nestedProtoView.bindVariable(name, value);
  } else {
  // Store the variable map from value to variable, reflecting how it will be used later by
- // RenderView. When a local is set to the view, a lookup for the variable name will take place keyed
+ // DomView. When a local is set to the view, a lookup for the variable name will take place keyed
  // by the "value", or exported identifier. For example, ng-repeat sets a view local of "index".
  // When this occurs, a lookup keyed by "index" must occur to find if there is a var referencing
  // it.

modules/angular2/src/render/dom/view/view.js

@@ -3,7 +3,7 @@ import {ListWrapper, MapWrapper, Map, StringMapWrapper, List} from 'angular2/src
 import {int, isPresent, isBlank, BaseException} from 'angular2/src/facade/lang';
 
 import {ViewContainer} from './view_container';
-import {RenderProtoView} from './proto_view';
+import {DomProtoView} from './proto_view';
 import {LightDom} from '../shadow_dom/light_dom';
 import {Content} from '../shadow_dom/content_tag';
 
@@ -14,29 +14,29 @@ const NG_BINDING_CLASS = 'ng-binding';
 /**
  * Const of making objects: http://jsperf.com/instantiate-size-of-object
  */
-export class RenderView {
+export class DomView {
  boundElements:List;
  boundTextNodes:List;
  /// When the view is part of render tree, the DocumentFragment is empty, which is why we need
  /// to keep track of the nodes.
  rootNodes:List;
  // TODO(tbosch): move componentChildViews, viewContainers, contentTags, lightDoms into
  // a single array with records inside
- componentChildViews: List<RenderView>;
+ componentChildViews: List<DomView>;
  viewContainers: List<ViewContainer>;
  contentTags: List<Content>;
  lightDoms: List<LightDom>;
  hostLightDom: LightDom;
- proto: RenderProtoView;
+ proto: DomProtoView;
  hydrated: boolean;
  _eventDispatcher: any/*EventDispatcher*/;
  eventHandlerRemovers: List<Function>;
  /// Host views that were added by an imperative view.
  /// This is a dynamically growing / shrinking array.
- imperativeHostViews: List<RenderView>;
+ imperativeHostViews: List<DomView>;
 
  constructor(
- proto:RenderProtoView, rootNodes:List,
+ proto:DomProtoView, rootNodes:List,
  boundTextNodes: List, boundElements:List, contentTags:List) {
  this.proto = proto;
  this.rootNodes = rootNodes;