refactor(ViewPort): @Template -> @Viewport, ViewPort -> ViewContainer

fixes #595

modules/angular2/src/core/compiler/pipeline/compile_element.js

@@ -2,9 +2,7 @@ import {List, Map, ListWrapper, MapWrapper} from 'angular2/src/facade/collection
 import {Element, DOM} from 'angular2/src/facade/dom';
 import {int, isBlank, isPresent, Type} from 'angular2/src/facade/lang';
 import {DirectiveMetadata} from '../directive_metadata';
-import {Decorator} from '../../annotations/annotations';
-import {Component} from '../../annotations/annotations';
-import {Template} from '../../annotations/annotations';
+import {Decorator, Component, Viewport} from '../../annotations/annotations';
 import {ElementBinder} from '../element_binder';
 import {ProtoElementInjector} from '../element_injector';
 import {ProtoView} from '../view';
@@ -29,7 +27,7 @@ export class CompileElement {
   /// Template name is how it is reffered to it in template
   variableBindings:Map;
   decoratorDirectives:List<DirectiveMetadata>;
-  templateDirective:DirectiveMetadata;
+  viewportDirective:DirectiveMetadata;
   componentDirective:DirectiveMetadata;
   _allDirectives:List<DirectiveMetadata>;
   isViewRoot:boolean;
@@ -50,7 +48,7 @@ export class CompileElement {
     this.eventBindings = null;
     this.variableBindings = null;
     this.decoratorDirectives = null;
-    this.templateDirective = null;
+    this.viewportDirective = null;
     this.componentDirective = null;
     this._allDirectives = null;
     this.isViewRoot = false;
@@ -141,8 +139,8 @@ export class CompileElement {
       if (!annotation.compileChildren) {
         this.compileChildren = false;
       }
-    } else if (annotation instanceof Template) {
-      this.templateDirective = directive;
+    } else if (annotation instanceof Viewport) {
+      this.viewportDirective = directive;
     } else if (annotation instanceof Component) {
       this.componentDirective = directive;
     }
@@ -156,8 +154,8 @@ export class CompileElement {
       if (isPresent(this.componentDirective)) {
         ListWrapper.push(directives, this.componentDirective);
       }
-      if (isPresent(this.templateDirective)) {
-        ListWrapper.push(directives, this.templateDirective);
+      if (isPresent(this.viewportDirective)) {
+        ListWrapper.push(directives, this.viewportDirective);
       }
       if (isPresent(this.decoratorDirectives)) {
         directives = ListWrapper.concat(directives, this.decoratorDirectives);

modules/angular2/src/core/compiler/pipeline/directive_parser.js

@@ -5,8 +5,7 @@ import {SelectorMatcher} from '../selector';
 import {CssSelector} from '../selector';
 
 import {DirectiveMetadata} from '../directive_metadata';
-import {Template} from '../../annotations/annotations';
-import {Component} from '../../annotations/annotations';
+import {Component, Viewport} from '../../annotations/annotations';
 import {CompileStep} from './compile_step';
 import {CompileElement} from './compile_element';
 import {CompileControl} from './compile_control';
@@ -70,10 +69,10 @@ export class DirectiveParser extends CompileStep {
     // only be present on <template> elements any more!
     var isTemplateElement = current.element instanceof TemplateElement;
     this._selectorMatcher.match(cssSelector, (directive) => {
-      if (directive.annotation instanceof Template) {
+      if (directive.annotation instanceof Viewport) {
         if (!isTemplateElement) {
-          throw new BaseException('Template directives need to be placed on <template> elements or elements with template attribute!');
-        } else if (isPresent(current.templateDirective)) {
+          throw new BaseException('Viewport directives need to be placed on <template> elements or elements with template attribute!');
+        } else if (isPresent(current.viewportDirective)) {
           throw new BaseException('Only one template directive per element is allowed!');
         }
       } else if (isTemplateElement) {

modules/angular2/src/core/compiler/pipeline/element_binder_builder.js

@@ -78,7 +78,7 @@ function styleSetterFactory(styleName:string, stylesuffix:string) {
  * - CompileElement#eventBindings
  * - CompileElement#decoratorDirectives
  * - CompileElement#componentDirective
- * - CompileElement#templateDirective
+ * - CompileElement#viewportDirective
  *
  * Note: This actually only needs the CompileElements with the flags
  * `hasBindings` and `isViewRoot`,
@@ -105,7 +105,7 @@ export class ElementBinderBuilder extends CompileStep {
           current.inheritedProtoElementInjector : null;
 
       elementBinder = protoView.bindElement(currentProtoElementInjector,
-        current.componentDirective, current.templateDirective);
+        current.componentDirective, current.viewportDirective);
 
       if (isPresent(current.textNodeBindings)) {
         this._bindTextNodes(protoView, current);

modules/angular2/src/core/compiler/pipeline/element_binding_marker.js

@@ -22,7 +22,7 @@ const NG_BINDING_CLASS = 'ng-binding';
  * - CompileElement#eventBindings
  * - CompileElement#decoratorDirectives
  * - CompileElement#componentDirective
- * - CompileElement#templateDirective
+ * - CompileElement#viewportDirective
  */
 export class ElementBindingMarker extends CompileStep {
   process(parent:CompileElement, current:CompileElement, control:CompileControl) {
@@ -36,7 +36,7 @@ export class ElementBindingMarker extends CompileStep {
       (isPresent(current.variableBindings) && MapWrapper.size(current.variableBindings)>0) ||
       (isPresent(current.eventBindings) && MapWrapper.size(current.eventBindings)>0) ||
       (isPresent(current.decoratorDirectives) && current.decoratorDirectives.length > 0) ||
-      isPresent(current.templateDirective) ||
+      isPresent(current.viewportDirective) ||
       isPresent(current.componentDirective);
 
     if (hasBindings) {

modules/angular2/src/core/compiler/pipeline/proto_element_injector_builder.js

@@ -23,7 +23,7 @@ import {DirectiveMetadata} from '../directive_metadata';
  * - CompileElement#inheritedProtoView
  * - CompileElement#decoratorDirectives
  * - CompileElement#componentDirective
- * - CompileElement#templateDirective
+ * - CompileElement#viewportDirective
  */
 export class ProtoElementInjectorBuilder extends CompileStep {
   // public so that we can overwrite it in tests
@@ -52,8 +52,8 @@ export class ProtoElementInjectorBuilder extends CompileStep {
       );
       current.distanceToParentInjector = 0;
 
-      // Template directives are treated differently than other element with var- definitions.
-      if (isPresent(current.variableBindings) && !isPresent(current.templateDirective)) {
+      // Viewport directives are treated differently than other element with var- definitions.
+      if (isPresent(current.variableBindings) && !isPresent(current.viewportDirective)) {
         current.inheritedProtoElementInjector.exportComponent = hasComponent;
         current.inheritedProtoElementInjector.exportElement = !hasComponent;