refactor(render): ts’ify render api

Author: tbosch

modules/angular2/globals.ts

@@ -2,12 +2,17 @@
  * This file contains declarations of global symbols we reference in our code
  */
 
+/// <reference path="typings/hammerjs/hammerjs"/>
+/// <reference path="typings/zone/zone.d.ts"/>
+
 declare var assert: any;
 declare var global: Window;
 type int = number;
 
 interface List<T> extends Array<T> {}
 
+interface StringMap<K,V> extends Object {}
+
 interface Window {
  Object: typeof Object;
  Array: typeof Array;
@@ -20,4 +25,6 @@ interface Window {
  assert: typeof assert;
  gc(): void;
  Reflect: any;
+ zone: Zone;
+ Hammer: HammerStatic;
 }

modules/angular2/src/core/compiler/view.js

@@ -6,6 +6,7 @@ import {ProtoElementInjector, ElementInjector, PreBuiltObjects, DirectiveBinding
 import {ElementBinder} from './element_binder';
 import {IMPLEMENTS, int, isPresent, isBlank, BaseException} from 'angular2/src/facade/lang';
 import * as renderApi from 'angular2/src/render/api';
+import {EventDispatcher} from 'angular2/src/render/api';
 
 export class AppViewContainer {
  views: List<AppView>;
@@ -21,8 +22,7 @@ export class AppViewContainer {
  *
  */
 @IMPLEMENTS(ChangeDispatcher)
-// TODO(tbosch): this is not supported in dart2js (no '.' is allowed)
-// @IMPLEMENTS(renderApi.EventDispatcher)
+@IMPLEMENTS(EventDispatcher)
 export class AppView {
  render:renderApi.RenderViewRef;
  /// This list matches the _nodes list. It is sparse, since only Elements have ElementInjector

modules/angular2/src/core/zone/ng_zone.cjs

@@ -19,19 +19,23 @@ export class NgZone {
  // onTurnDone hook at the end of the current VM turn.
  _innerZone;
 
- _onTurnStart:Function;
- _onTurnDone:Function;
- _onErrorHandler:Function;
+ _onTurnStart: () => void;
+ _onTurnDone: () => void;
+ _onErrorHandler: (error, stack) => void;
 
  // Number of microtasks pending from _innerZone (& descendants)
- _pendingMicrotask: number;
+ _pendingMicrotasks: number;
  // Whether some code has been executed in the _innerZone (& descendants) in the current turn
  _hasExecutedCodeInInnerZone: boolean;
  // run() call depth in _mountZone. 0 at the end of a macrotask
  // zone.run(() => { // top-level call
  // zone.run(() => {}); // nested call -> in-turn
  // });
  _nestedRun: number;
+ 
+ // TODO(vicb): implement this class properly for node.js environment
+ // This disabled flag is only here to please cjs tests
+ _disabled: boolean;
 
  /**
  * Associates with this
@@ -50,19 +54,31 @@ export class NgZone {
  this._pendingMicrotasks = 0;
  this._hasExecutedCodeInInnerZone = false;
  this._nestedRun = 0;
-
- this._mountZone = global.zone;
- this._innerZone = this._createInnerZone(this._mountZone, enableLongStackTrace)
+ 
+ if (global.zone) {
+ this._disabled = false;
+ this._mountZone = global.zone;
+ this._innerZone = this._createInnerZone(this._mountZone, enableLongStackTrace)
+ } else {
+ this._disabled = true;
+ this._mountZone = null;
+ }
  }
 
  /**
  * Initializes the zone hooks.
  *
- * @param {Function} onTurnStart called before code executes in the inner zone for each VM turn
- * @param {Function} onTurnDone called at the end of a VM turn if code has executed in the inner zone
- * @param {Function} onErrorHandler called when an exception is thrown by a macro or micro task
+ * @param {() => void} onTurnStart called before code executes in the inner zone for each VM turn
+ * @param {() => void} onTurnDone called at the end of a VM turn if code has executed in the inner
+ * zone
+ * @param {(error, stack) => void} onErrorHandler called when an exception is thrown by a macro or
+ * micro task
  */
- initCallbacks({onTurnStart, onTurnDone, onErrorHandler} = {}) {
+ initCallbacks({onTurnStart, onTurnDone, onErrorHandler}: {
+ onTurnStart?: () => void,
+ onTurnDone?: () => void,
+ onErrorHandler?: (error, stack) => void
+ } = {}) {
  this._onTurnStart = normalizeBlank(onTurnStart);
  this._onTurnDone = normalizeBlank(onTurnDone);
  this._onErrorHandler = normalizeBlank(onErrorHandler);
@@ -78,12 +94,17 @@ export class NgZone {
  * var zone: NgZone = [ref to the application zone];
  *
  * zone.run(() => {
- * // the change detection will run after this function and the microtasks it enqueues have executed.
+ * // the change detection will run after this function and the microtasks it enqueues have
+ * executed.
  * });
  * ```
  */
- run(fn) {
- return this._innerZone.run(fn);
+ run(fn) { 
+ if (this._disabled) {
+ return fn();
+ } else {
+ return this._innerZone.run(fn); 
+ }
  }
 
  /**
@@ -102,30 +123,28 @@ export class NgZone {
  * });
  * ```
  */
- runOutsideAngular(fn) {
- return this._mountZone.run(fn);
+ runOutsideAngular(fn) { 
+ if (this._disabled) {
+ return fn();
+ } else {
+ return this._mountZone.run(fn);
+ } 
  }
 
  _createInnerZone(zone, enableLongStackTrace) {
  var ngZone = this;
  var errorHandling;
 
  if (enableLongStackTrace) {
- errorHandling = StringMapWrapper.merge(Zone.longStackTraceZone, {
- onError: function (e) {
- ngZone._onError(this, e)
- }
- });
+ errorHandling = StringMapWrapper.merge(Zone.longStackTraceZone,
+ {onError: function(e) { ngZone._onError(this, e) }});
  } else {
  errorHandling = {
- onError: function (e) {
- ngZone._onError(this, e)
- }
+ onError: function(e) { ngZone._onError(this, e) }
  };
  }
 
- return zone
- .fork(errorHandling)
+ return zone.fork(errorHandling)
  .fork({
  '$run': function(parentRun) {
  return function() {
@@ -140,8 +159,10 @@ export class NgZone {
  return parentRun.apply(this, arguments);
  } finally {
  ngZone._nestedRun--;
- // If there are no more pending microtasks, we are at the end of a VM turn (or in onTurnStart)
- // _nestedRun will be 0 at the end of a macrotasks (it could be > 0 when there are nested calls
+ // If there are no more pending microtasks, we are at the end of a VM turn (or in
+ // onTurnStart)
+ // _nestedRun will be 0 at the end of a macrotasks (it could be > 0 when there are
+ // nested calls
  // to run()).
  if (ngZone._pendingMicrotasks == 0 && ngZone._nestedRun == 0) {
  if (ngZone._onTurnDone && ngZone._hasExecutedCodeInInnerZone) {

modules/angular2/src/core/zone/ng_zone.es6 renamed to modules/angular2/src/core/zone/ng_zone.ts

@@ -273,7 +273,7 @@ defaultDoc() {
 getBoundingClientRect(el) {
  return el.getBoundingClientRect();
 }
-getTitle() {
+getTitle(): string {
  return document.title;
 }
 setTitle(newTitle: string) {

modules/angular2/src/dom/browser_adapter.ts

@@ -81,7 +81,7 @@ export class DomAdapter {
  removeStyle(element, stylename: string) { throw _abstract(); }
  getStyle(element, stylename: string) { throw _abstract(); }
  tagName(element): string { throw _abstract(); }
- attributeMap(element) { throw _abstract(); }
+ attributeMap(element): Map<string, string> { throw _abstract(); }
  hasAttribute(element, attribute: string): boolean { throw _abstract(); }
  getAttribute(element, attribute: string): string { throw _abstract(); }
  setAttribute(element, name: string, value: string) { throw _abstract(); }
@@ -90,7 +90,7 @@ export class DomAdapter {
  createHtmlDocument() { throw _abstract(); }
  defaultDoc(): any { throw _abstract(); }
  getBoundingClientRect(el) { throw _abstract(); }
- getTitle() { throw _abstract(); }
+ getTitle(): string { throw _abstract(); }
  setTitle(newTitle: string) { throw _abstract(); }
  elementMatches(n, selector: string): boolean { throw _abstract(); }
  isTemplateElement(el: any): boolean { throw _abstract(); }