@angular/router 2.0.0-rc.1 → 2.0.0-rc.2

package/index.js

@@ -1,48 +1,31 @@
-"use strict";
 /**
-* @module
-* @description
-* Maps application URLs into application states, to support deep-linking and navigation.
-*/
+ * @module
+ * @description
+ * Maps application URLs into application states, to support deep-linking and navigation.
+ */
+"use strict";
+var router_directives_1 = require('./src/directives/router_directives');
+exports.ROUTER_DIRECTIVES = router_directives_1.ROUTER_DIRECTIVES;
+var router_link_1 = require('./src/directives/router_link');
+exports.RouterLink = router_link_1.RouterLink;
+var router_outlet_1 = require('./src/directives/router_outlet');
+exports.RouterOutlet = router_outlet_1.RouterOutlet;
+var decorators_1 = require('./src/metadata/decorators');
+exports.Routes = decorators_1.Routes;
+var metadata_1 = require('./src/metadata/metadata');
+exports.Route = metadata_1.Route;
 var router_1 = require('./src/router');
 exports.Router = router_1.Router;
 exports.RouterOutletMap = router_1.RouterOutletMap;
+var router_providers_1 = require('./src/router_providers');
+exports.ROUTER_PROVIDERS = router_providers_1.ROUTER_PROVIDERS;
+var router_url_serializer_1 = require('./src/router_url_serializer');
+exports.DefaultRouterUrlSerializer = router_url_serializer_1.DefaultRouterUrlSerializer;
+exports.RouterUrlSerializer = router_url_serializer_1.RouterUrlSerializer;
 var segments_1 = require('./src/segments');
 exports.RouteSegment = segments_1.RouteSegment;
-exports.UrlSegment = segments_1.UrlSegment;
+exports.RouteTree = segments_1.RouteTree;
 exports.Tree = segments_1.Tree;
+exports.UrlSegment = segments_1.UrlSegment;
 exports.UrlTree = segments_1.UrlTree;
-exports.RouteTree = segments_1.RouteTree;
-var decorators_1 = require('./src/metadata/decorators');
-exports.Routes = decorators_1.Routes;
-var metadata_1 = require('./src/metadata/metadata');
-exports.Route = metadata_1.Route;
-var router_url_serializer_1 = require('./src/router_url_serializer');
-exports.RouterUrlSerializer = router_url_serializer_1.RouterUrlSerializer;
-exports.DefaultRouterUrlSerializer = router_url_serializer_1.DefaultRouterUrlSerializer;
-var router_providers_1 = require('./src/router_providers');
-exports.ROUTER_PROVIDERS = router_providers_1.ROUTER_PROVIDERS;
-var router_outlet_1 = require('./src/directives/router_outlet');
-var router_link_1 = require('./src/directives/router_link');
-/**
- * A list of directives. To use the router directives like {@link RouterOutlet} and
- * {@link RouterLink}, add this to your `directives` array in the {@link View} decorator of your
- * component.
- *
- * ```
- * import {Component} from '@angular/core';
- * import {ROUTER_DIRECTIVES, Routes} from '@angular/router-deprecated';
- *
- * @Component({directives: [ROUTER_DIRECTIVES]})
- * @RouteConfig([
- *  {...},
- * ])
- * class AppCmp {
- *    // ...
- * }
- *
- * bootstrap(AppCmp);
- * ```
- */
-exports.ROUTER_DIRECTIVES = [router_outlet_1.RouterOutlet, router_link_1.RouterLink];
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../modules/@angular/router/index.ts"],"names":[],"mappings":";AAIE;;;;EAIC;AAEH,uBAAsC,cAAc,CAAC;AAA7C,iCAAM;AAAE,mDAAqC;AACrD,yBAAiE,gBAAgB,CAAC;AAA1E,+CAAY;AAAE,2CAAU;AAAE,+BAAI;AAAE,qCAAO;AAAE,yCAAiC;AAClF,2BAAqB,2BAA2B,CAAC;AAAzC,qCAAyC;AACjD,yBAAoB,yBAAyB,CAAC;AAAtC,iCAAsC;AAC9C,sCAA8D,6BAA6B,CAAC;AAApF,0EAAmB;AAAE,wFAA+D;AAE5F,iCAA+B,wBAAwB,CAAC;AAAhD,+DAAgD;AAExD,8BAA2B,gCAAgC,CAAC,CAAA;AAC5D,4BAAyB,8BAA8B,CAAC,CAAA;AAExD;;;;;;;;;;;;;;;;;;;GAmBG;AACU,yBAAiB,GAA4B,CAAC,4BAAY,EAAE,wBAAU,CAAC,CAAC","sourcesContent":["interface DecoratorInvocation {\n    type: Function;\n    args?: any[];\n  }\n  /**\n * @module\n * @description\n * Maps application URLs into application states, to support deep-linking and navigation.\n */\n\nexport {Router, RouterOutletMap} from './src/router';\nexport {RouteSegment, UrlSegment, Tree, UrlTree, RouteTree} from './src/segments';\nexport {Routes} from './src/metadata/decorators';\nexport {Route} from './src/metadata/metadata';\nexport {RouterUrlSerializer, DefaultRouterUrlSerializer} from './src/router_url_serializer';\nexport {OnActivate, CanDeactivate} from './src/interfaces';\nexport {ROUTER_PROVIDERS} from './src/router_providers';\n\nimport {RouterOutlet} from './src/directives/router_outlet';\nimport {RouterLink} from './src/directives/router_link';\n\n/**\n * A list of directives. To use the router directives like {@link RouterOutlet} and\n * {@link RouterLink}, add this to your `directives` array in the {@link View} decorator of your\n * component.\n *\n * ```\n * import {Component} from '@angular/core';\n * import {ROUTER_DIRECTIVES, Routes} from '@angular/router-deprecated';\n *\n * @Component({directives: [ROUTER_DIRECTIVES]})\n * @RouteConfig([\n *  {...},\n * ])\n * class AppCmp {\n *    // ...\n * }\n *\n * bootstrap(AppCmp);\n * ```\n */\nexport const ROUTER_DIRECTIVES: any[] = /*@ts2dart_const*/[RouterOutlet, RouterLink];\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../modules/@angular/router/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;AAEH,kCAAgC,oCAAoC,CAAC;AAA7D,kEAA6D;AACrE,4BAAyB,8BAA8B,CAAC;AAAhD,8CAAgD;AACxD,8BAA2B,gCAAgC,CAAC;AAApD,oDAAoD;AAE5D,2BAAqB,2BAA2B,CAAC;AAAzC,qCAAyC;AACjD,yBAAoB,yBAAyB,CAAC;AAAtC,iCAAsC;AAC9C,uBAAsC,cAAc,CAAC;AAA7C,iCAAM;AAAE,mDAAqC;AACrD,iCAA+B,wBAAwB,CAAC;AAAhD,+DAAgD;AACxD,sCAA8D,6BAA6B,CAAC;AAApF,wFAA0B;AAAE,0EAAwD;AAC5F,yBAAiE,gBAAgB,CAAC;AAA1E,+CAAY;AAAE,yCAAS;AAAE,+BAAI;AAAE,2CAAU;AAAE,qCAA+B","sourcesContent":["/**\n * @module\n * @description\n * Maps application URLs into application states, to support deep-linking and navigation.\n */\n\nexport {ROUTER_DIRECTIVES} from './src/directives/router_directives';\nexport {RouterLink} from './src/directives/router_link';\nexport {RouterOutlet} from './src/directives/router_outlet';\nexport {CanDeactivate, OnActivate} from './src/interfaces';\nexport {Routes} from './src/metadata/decorators';\nexport {Route} from './src/metadata/metadata';\nexport {Router, RouterOutletMap} from './src/router';\nexport {ROUTER_PROVIDERS} from './src/router_providers';\nexport {DefaultRouterUrlSerializer, RouterUrlSerializer} from './src/router_url_serializer';\nexport {RouteSegment, RouteTree, Tree, UrlSegment, UrlTree} from './src/segments';\n\ninterface DecoratorInvocation {\n  type: Function;\n  args?: any[];\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/router",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0-rc.2",
   "description": "",
   "main": "index.js",
   "jsnext:main": "esm/index.js",
@@ -8,8 +8,12 @@
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
-    "@angular/core": "2.0.0-rc.1",
-    "@angular/common": "2.0.0-rc.1",
-    "@angular/platform-browser": "2.0.0-rc.1"
+    "@angular/core": "^2.0.0-rc",
+    "@angular/common": "^2.0.0-rc",
+    "@angular/platform-browser": "^2.0.0-rc"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/angular/angular.git"
   }
 }

package/src/constants.js

@@ -1,7 +1,7 @@
 "use strict";
 /**
-* Name of the default outlet outlet.
-* @type {string}
-*/
-exports.DEFAULT_OUTLET_NAME = "__DEFAULT";
+ * Name of the default outlet outlet.
+ * @type {string}
+ */
+exports.DEFAULT_OUTLET_NAME = '__DEFAULT';
 //# sourceMappingURL=constants.js.map

package/src/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../modules/@angular/router/src/constants.ts"],"names":[],"mappings":";AAIE;;;EAGC;AACU,2BAAmB,GAAG,WAAW,CAAC","sourcesContent":["interface DecoratorInvocation {\n    type: Function;\n    args?: any[];\n  }\n  /**\n * Name of the default outlet outlet.\n * @type {string}\n */\nexport const DEFAULT_OUTLET_NAME = \"__DEFAULT\";"]}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../modules/@angular/router/src/constants.ts"],"names":[],"mappings":";AAAA;;;GAGG;AACU,2BAAmB,GAAG,WAAW,CAAC","sourcesContent":["/**\n * Name of the default outlet outlet.\n * @type {string}\n */\nexport const DEFAULT_OUTLET_NAME = '__DEFAULT';\ninterface DecoratorInvocation {\n  type: Function;\n  args?: any[];\n}\n"]}

package/src/constants.metadata.json

@@ -1 +1 @@
-{"__symbolic":"module","metadata":{"DEFAULT_OUTLET_NAME":"__DEFAULT"}}
+{"__symbolic":"module","version":1,"metadata":{"DEFAULT_OUTLET_NAME":"__DEFAULT"}}

package/src/core_private.d.ts

@@ -1,2 +1,3 @@
-import { __core_private__ } from '@angular/core';
-export declare var makeDecorator: typeof __core_private__.makeDecorator;
+import { __core_private__ as _ } from '@angular/core';
+export declare var makeDecorator: typeof _.makeDecorator;
+export declare var reflector: typeof _.reflector;

package/src/core_private.js

@@ -1,4 +1,5 @@
 "use strict";
 var core_1 = require('@angular/core');
 exports.makeDecorator = core_1.__core_private__.makeDecorator;
+exports.reflector = core_1.__core_private__.reflector;
 //# sourceMappingURL=core_private.js.map

package/src/core_private.js.map

@@ -1 +1 @@
-{"version":3,"file":"core_private.js","sourceRoot":"","sources":["../../../../modules/@angular/router/src/core_private.ts"],"names":[],"mappings":";AAIE,qBAA+B,eAAe,CAAC,CAAA;AAEtC,qBAAa,GAA0C,uBAAgB,CAAC,aAAa,CAAC","sourcesContent":["interface DecoratorInvocation {\n    type: Function;\n    args?: any[];\n  }\n  import {__core_private__} from '@angular/core';\n\nexport var makeDecorator: typeof __core_private__.makeDecorator = __core_private__.makeDecorator;\n"]}
+{"version":3,"file":"core_private.js","sourceRoot":"","sources":["../../../../modules/@angular/router/src/core_private.ts"],"names":[],"mappings":";AAAA,qBAAoC,eAAe,CAAC,CAAA;AAEzC,qBAAa,GAA2B,uBAAC,CAAC,aAAa,CAAC;AACxD,iBAAS,GAAuB,uBAAC,CAAC,SAAS,CAAC","sourcesContent":["import {__core_private__ as _} from '@angular/core';\n\nexport var makeDecorator: typeof _.makeDecorator = _.makeDecorator;\nexport var reflector: typeof _.reflector = _.reflector;\n\ninterface DecoratorInvocation {\n  type: Function;\n  args?: any[];\n}\n"]}

package/src/core_private.metadata.json

@@ -1 +1 @@
-{"__symbolic":"module","metadata":{"makeDecorator":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"___core_private__","module":"@angular/core"},"member":"makeDecorator"}}}
+{"__symbolic":"module","version":1,"metadata":{"makeDecorator":{"__symbolic":"select","expression":{"__symbolic":"reference","module":"@angular/core","name":"___core_private__"},"member":"makeDecorator"},"reflector":{"__symbolic":"select","expression":{"__symbolic":"reference","module":"@angular/core","name":"___core_private__"},"member":"reflector"}}}

package/src/directives/router_directives.d.ts

@@ -0,0 +1,21 @@
+/**
+ * A list of directives. To use the router directives like {@link RouterOutlet} and
+ * {@link RouterLink}, add this to your `directives` array in the {@link View} decorator of your
+ * component.
+ *
+ * ```
+ * import {Component} from '@angular/core';
+ * import {ROUTER_DIRECTIVES, Routes} from '@angular/router';
+ *
+ * @Component({directives: [ROUTER_DIRECTIVES]})
+ * @Routes([
+ *  {...},
+ * ])
+ * class AppCmp {
+ *    // ...
+ * }
+ *
+ * bootstrap(AppCmp);
+ * ```
+ */
+export declare const ROUTER_DIRECTIVES: any[];

package/src/directives/router_directives.js

@@ -0,0 +1,25 @@
+"use strict";
+var router_link_1 = require('./router_link');
+var router_outlet_1 = require('./router_outlet');
+/**
+ * A list of directives. To use the router directives like {@link RouterOutlet} and
+ * {@link RouterLink}, add this to your `directives` array in the {@link View} decorator of your
+ * component.
+ *
+ * ```
+ * import {Component} from '@angular/core';
+ * import {ROUTER_DIRECTIVES, Routes} from '@angular/router';
+ *
+ * @Component({directives: [ROUTER_DIRECTIVES]})
+ * @Routes([
+ *  {...},
+ * ])
+ * class AppCmp {
+ *    // ...
+ * }
+ *
+ * bootstrap(AppCmp);
+ * ```
+ */
+exports.ROUTER_DIRECTIVES = [router_outlet_1.RouterOutlet, router_link_1.RouterLink];
+//# sourceMappingURL=router_directives.js.map

package/src/directives/router_directives.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"router_directives.js","sourceRoot":"","sources":["../../../../../modules/@angular/router/src/directives/router_directives.ts"],"names":[],"mappings":";AAAA,4BAAyB,eAAe,CAAC,CAAA;AACzC,8BAA2B,iBAAiB,CAAC,CAAA;AAE7C;;;;;;;;;;;;;;;;;;;GAmBG;AAEU,yBAAiB,GAA4B,CAAC,4BAAY,EAAE,wBAAU,CAAC,CAAC","sourcesContent":["import {RouterLink} from './router_link';\nimport {RouterOutlet} from './router_outlet';\n\n/**\n * A list of directives. To use the router directives like {@link RouterOutlet} and\n * {@link RouterLink}, add this to your `directives` array in the {@link View} decorator of your\n * component.\n *\n * ```\n * import {Component} from '@angular/core';\n * import {ROUTER_DIRECTIVES, Routes} from '@angular/router';\n *\n * @Component({directives: [ROUTER_DIRECTIVES]})\n * @Routes([\n *  {...},\n * ])\n * class AppCmp {\n *    // ...\n * }\n *\n * bootstrap(AppCmp);\n * ```\n */\n\nexport const ROUTER_DIRECTIVES: any[] = /*@ts2dart_const*/[RouterOutlet, RouterLink];\n\ninterface DecoratorInvocation {\n  type: Function;\n  args?: any[];\n}\n"]}

package/src/directives/router_directives.metadata.json

@@ -0,0 +1 @@
+{"__symbolic":"module","version":1,"metadata":{"ROUTER_DIRECTIVES":[{"__symbolic":"reference","module":"./router_outlet","name":"RouterOutlet"},{"__symbolic":"reference","module":"./router_link","name":"RouterLink"}]}}

package/src/directives/router_link.d.ts

@@ -1,3 +1,4 @@
+import { LocationStrategy } from '@angular/common';
 import { OnDestroy } from '@angular/core';
 import { Router } from '../router';
 import { RouteSegment } from '../segments';
@@ -34,14 +35,15 @@ import { RouteSegment } from '../segments';
 export declare class RouterLink implements OnDestroy {
     private _routeSegment;
     private _router;
+    private _locationStrategy;
     target: string;
     private _commands;
     private _subscription;
     href: string;
     isActive: boolean;
-    constructor(_routeSegment: RouteSegment, _router: Router);
+    constructor(_routeSegment: RouteSegment, _router: Router, _locationStrategy: LocationStrategy);
     ngOnDestroy(): void;
     routerLink: any[] | any;
-    onClick(): boolean;
+    onClick(button: number, ctrlKey: boolean, metaKey: boolean): boolean;
     private _updateTargetUrlAndHref();
 }

package/src/directives/router_link.js

@@ -1,14 +1,16 @@
 "use strict";
+var common_1 = require('@angular/common');
 var core_1 = require('@angular/core');
+var async_1 = require('../facade/async');
+var lang_1 = require('../facade/lang');
 var router_1 = require('../router');
 var segments_1 = require('../segments');
-var lang_1 = require('../facade/lang');
-var async_1 = require('../facade/async');
 var RouterLink = (function () {
-    function RouterLink(_routeSegment, _router) {
+    function RouterLink(_routeSegment, _router, _locationStrategy) {
         var _this = this;
         this._routeSegment = _routeSegment;
         this._router = _router;
+        this._locationStrategy = _locationStrategy;
         this._commands = [];
         this.isActive = false;
         // because auxiliary links take existing primary and auxiliary routes into account,
@@ -30,37 +32,43 @@ var RouterLink = (function () {
         enumerable: true,
         configurable: true
     });
-    RouterLink.prototype.onClick = function () {
-        // If no target, or if target is _self, prevent default browser behavior
-        if (!lang_1.isString(this.target) || this.target == '_self') {
-            this._router.navigate(this._commands, this._routeSegment);
-            return false;
+    RouterLink.prototype.onClick = function (button, ctrlKey, metaKey) {
+        if (button != 0 || ctrlKey || metaKey) {
+            return true;
+        }
+        if (lang_1.isString(this.target) && this.target != '_self') {
+            return true;
         }
-        return true;
+        this._router.navigate(this._commands, this._routeSegment);
+        return false;
     };
     RouterLink.prototype._updateTargetUrlAndHref = function () {
         var tree = this._router.createUrlTree(this._commands, this._routeSegment);
         if (lang_1.isPresent(tree)) {
-            this.href = this._router.serializeUrl(tree);
+            this.href = this._locationStrategy.prepareExternalUrl(this._router.serializeUrl(tree));
             this.isActive = this._router.urlTree.contains(tree);
         }
         else {
             this.isActive = false;
         }
     };
+    /** @nocollapse */
     RouterLink.decorators = [
         { type: core_1.Directive, args: [{ selector: '[routerLink]' },] },
     ];
+    /** @nocollapse */
     RouterLink.ctorParameters = [
-        { type: segments_1.RouteSegment, decorators: [{ type: core_1.Optional },] },
+        { type: segments_1.RouteSegment, },
         { type: router_1.Router, },
+        { type: common_1.LocationStrategy, },
     ];
+    /** @nocollapse */
     RouterLink.propDecorators = {
         'target': [{ type: core_1.Input },],
         'href': [{ type: core_1.HostBinding },],
         'isActive': [{ type: core_1.HostBinding, args: ['class.router-link-active',] },],
         'routerLink': [{ type: core_1.Input },],
-        'onClick': [{ type: core_1.HostListener, args: ["click",] },],
+        'onClick': [{ type: core_1.HostListener, args: ['click', ['$event.button', '$event.ctrlKey', '$event.metaKey'],] },],
     };
     return RouterLink;
 }());

package/src/directives/router_link.js.map

@@ -1 +1 @@
-{"version":3,"file":"router_link.js","sourceRoot":"","sources":["../../../../../modules/@angular/router/src/directives/router_link.ts"],"names":[],"mappings":"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","sourcesContent":["interface DecoratorInvocation {\n    type: Function;\n    args?: any[];\n  }\n  import {\n  ResolvedReflectiveProvider,\n  Directive,\n  DynamicComponentLoader,\n  ViewContainerRef,\n  Attribute,\n  ComponentRef,\n  ComponentFactory,\n  ReflectiveInjector,\n  OnInit,\n  HostListener,\n  HostBinding,\n  Input,\n  OnDestroy,\n  Optional\n} from '@angular/core';\nimport {RouterOutletMap, Router} from '../router';\nimport {RouteSegment, UrlSegment, Tree} from '../segments';\nimport {isString, isArray, isPresent} from '../facade/lang';\nimport {ObservableWrapper} from '../facade/async';\nexport class RouterLink implements OnDestroy { target: string;\n  private _commands: any[] = [];\n  private _subscription: any; href: string; isActive: boolean = false;\n\n  constructor( private _routeSegment: RouteSegment, private _router: Router) {\n    // because auxiliary links take existing primary and auxiliary routes into account,\n    // we need to update the link whenever params or other routes change.\n    this._subscription =\n        ObservableWrapper.subscribe(_router.changes, (_) => { this._updateTargetUrlAndHref(); });\n  }\n\n  ngOnDestroy() { ObservableWrapper.dispose(this._subscription); }\n  set routerLink(data: any[]|any) {\n    if (isArray(data)) {\n      this._commands = <any[]>data;\n    } else {\n      this._commands = [data];\n    }\n    this._updateTargetUrlAndHref();\n  }\n  onClick(): boolean {\n    // If no target, or if target is _self, prevent default browser behavior\n    if (!isString(this.target) || this.target == '_self') {\n      this._router.navigate(this._commands, this._routeSegment);\n      return false;\n    }\n    return true;\n  }\n\n  private _updateTargetUrlAndHref(): void {\n    let tree = this._router.createUrlTree(this._commands, this._routeSegment);\n    if (isPresent(tree)) {\n      this.href = this._router.serializeUrl(tree);\n      this.isActive = this._router.urlTree.contains(tree);\n    } else {\n      this.isActive = false;\n    }\n  }\nstatic decorators: DecoratorInvocation[] = [\n{ type: Directive, args: [{selector: '[routerLink]'}, ] },\n];\nstatic ctorParameters: {type: Function, decorators?: DecoratorInvocation[]}[] = [\n{type: RouteSegment, decorators: [{ type: Optional }, ]},\n{type: Router, },\n];\nstatic propDecorators: {[key: string]: DecoratorInvocation[]} = {\n'target': [{ type: Input },],\n'href': [{ type: HostBinding },],\n'isActive': [{ type: HostBinding, args: ['class.router-link-active', ] },],\n'routerLink': [{ type: Input },],\n'onClick': [{ type: HostListener, args: [\"click\", ] },],\n};\n}\n"]}
+{"version":3,"file":"router_link.js","sourceRoot":"","sources":["../../../../../modules/@angular/router/src/directives/router_link.ts"],"names":[],"mappings":"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","sourcesContent":["import {LocationStrategy} from '@angular/common';\nimport {Directive, HostBinding, HostListener, Input, OnDestroy} from '@angular/core';\n\nimport {ObservableWrapper} from '../facade/async';\nimport {isArray, isPresent, isString} from '../facade/lang';\nimport {Router} from '../router';\nimport {RouteSegment} from '../segments';\nexport class RouterLink implements OnDestroy { target: string;\n  private _commands: any[] = [];\n  private _subscription: any; href: string; isActive: boolean = false;\n\n  constructor(\n      private _routeSegment: RouteSegment, private _router: Router,\n      private _locationStrategy: LocationStrategy) {\n    // because auxiliary links take existing primary and auxiliary routes into account,\n    // we need to update the link whenever params or other routes change.\n    this._subscription =\n        ObservableWrapper.subscribe(_router.changes, (_) => { this._updateTargetUrlAndHref(); });\n  }\n\n  ngOnDestroy() { ObservableWrapper.dispose(this._subscription); }\n  set routerLink(data: any[]|any) {\n    if (isArray(data)) {\n      this._commands = <any[]>data;\n    } else {\n      this._commands = [data];\n    }\n    this._updateTargetUrlAndHref();\n  }\n  onClick(button: number, ctrlKey: boolean, metaKey: boolean): boolean {\n    if (button != 0 || ctrlKey || metaKey) {\n      return true;\n    }\n\n    if (isString(this.target) && this.target != '_self') {\n      return true;\n    }\n\n    this._router.navigate(this._commands, this._routeSegment);\n    return false;\n  }\n\n  private _updateTargetUrlAndHref(): void {\n    let tree = this._router.createUrlTree(this._commands, this._routeSegment);\n    if (isPresent(tree)) {\n      this.href = this._locationStrategy.prepareExternalUrl(this._router.serializeUrl(tree));\n      this.isActive = this._router.urlTree.contains(tree);\n    } else {\n      this.isActive = false;\n    }\n  }\n/** @nocollapse */\nstatic decorators: DecoratorInvocation[] = [\n{ type: Directive, args: [{selector: '[routerLink]'}, ] },\n];\n/** @nocollapse */\nstatic ctorParameters: {type: Function, decorators?: DecoratorInvocation[]}[] = [\n{type: RouteSegment, },\n{type: Router, },\n{type: LocationStrategy, },\n];\n/** @nocollapse */\nstatic propDecorators: {[key: string]: DecoratorInvocation[]} = {\n'target': [{ type: Input },],\n'href': [{ type: HostBinding },],\n'isActive': [{ type: HostBinding, args: ['class.router-link-active', ] },],\n'routerLink': [{ type: Input },],\n'onClick': [{ type: HostListener, args: ['click', ['$event.button', '$event.ctrlKey', '$event.metaKey'], ] },],\n};\n}\n\ninterface DecoratorInvocation {\n  type: Function;\n  args?: any[];\n}\n"]}

package/src/directives/router_link.metadata.json

@@ -1 +1 @@
-{"__symbolic":"module","metadata":{"RouterLink":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","name":"Directive","module":"@angular/core"},"arguments":[{"selector":"[routerLink]"}]}],"members":{"target":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","name":"Input","module":"@angular/core"}}]}],"href":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","name":"HostBinding","module":"@angular/core"}}]}],"isActive":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","name":"HostBinding","module":"@angular/core"},"arguments":["class.router-link-active"]}]}],"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[[{"__symbolic":"call","expression":{"__symbolic":"reference","name":"Optional","module":"@angular/core"}}],null],"parameters":[{"__symbolic":"reference","name":"RouteSegment","module":"../segments"},{"__symbolic":"reference","name":"Router","module":"../router"}]}],"routerLink":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","name":"Input","module":"@angular/core"}}]}],"onClick":[{"__symbolic":"method","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","name":"HostListener","module":"@angular/core"},"arguments":["click"]}]}]}}}}
+{"__symbolic":"module","version":1,"metadata":{"RouterLink":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Directive"},"arguments":[{"selector":"[routerLink]"}]}],"members":{"target":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input"}}]}],"href":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"HostBinding"}}]}],"isActive":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"HostBinding"},"arguments":["class.router-link-active"]}]}],"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../segments","name":"RouteSegment"},{"__symbolic":"reference","module":"../router","name":"Router"},{"__symbolic":"reference","module":"@angular/common","name":"LocationStrategy"}]}],"ngOnDestroy":[{"__symbolic":"method"}],"routerLink":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input"}}]}],"onClick":[{"__symbolic":"method","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"HostListener"},"arguments":["click",["$event.button","$event.ctrlKey","$event.metaKey"]]}]}],"_updateTargetUrlAndHref":[{"__symbolic":"method"}]}}}}

package/src/directives/router_outlet.d.ts

@@ -1,4 +1,4 @@
-import { ResolvedReflectiveProvider, ViewContainerRef, ComponentRef, ComponentFactory } from '@angular/core';
+import { ComponentFactory, ComponentRef, ResolvedReflectiveProvider, ViewContainerRef } from '@angular/core';
 import { RouterOutletMap } from '../router';
 /**
  * A router outlet is a placeholder that Angular dynamically fills based on the application's route.
@@ -17,20 +17,20 @@ import { RouterOutletMap } from '../router';
  */
 export declare class RouterOutlet {
     private _location;
-    private _loaded;
+    private _activated;
     outletMap: RouterOutletMap;
     constructor(parentOutletMap: RouterOutletMap, _location: ViewContainerRef, name: string);
-    unload(): void;
+    deactivate(): void;
     /**
      * Returns the loaded component.
      */
-    loadedComponent: Object;
+    component: Object;
     /**
      * Returns true is the outlet is not empty.
      */
-    isLoaded: boolean;
+    isActivated: boolean;
     /**
      * Called by the Router to instantiate a new component.
      */
-    load(factory: ComponentFactory<any>, providers: ResolvedReflectiveProvider[], outletMap: RouterOutletMap): ComponentRef<any>;
+    activate(factory: ComponentFactory<any>, providers: ResolvedReflectiveProvider[], outletMap: RouterOutletMap): ComponentRef<any>;
 }

package/src/directives/router_outlet.js

@@ -1,45 +1,47 @@
 "use strict";
 var core_1 = require('@angular/core');
-var router_1 = require('../router');
 var constants_1 = require('../constants');
 var lang_1 = require('../facade/lang');
+var router_1 = require('../router');
 var RouterOutlet = (function () {
     function RouterOutlet(parentOutletMap, _location, name) {
         this._location = _location;
         parentOutletMap.registerOutlet(lang_1.isBlank(name) ? constants_1.DEFAULT_OUTLET_NAME : name, this);
     }
-    RouterOutlet.prototype.unload = function () {
-        this._loaded.destroy();
-        this._loaded = null;
+    RouterOutlet.prototype.deactivate = function () {
+        this._activated.destroy();
+        this._activated = null;
     };
-    Object.defineProperty(RouterOutlet.prototype, "loadedComponent", {
+    Object.defineProperty(RouterOutlet.prototype, "component", {
         /**
          * Returns the loaded component.
          */
-        get: function () { return lang_1.isPresent(this._loaded) ? this._loaded.instance : null; },
+        get: function () { return lang_1.isPresent(this._activated) ? this._activated.instance : null; },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(RouterOutlet.prototype, "isLoaded", {
+    Object.defineProperty(RouterOutlet.prototype, "isActivated", {
         /**
          * Returns true is the outlet is not empty.
          */
-        get: function () { return lang_1.isPresent(this._loaded); },
+        get: function () { return lang_1.isPresent(this._activated); },
         enumerable: true,
         configurable: true
     });
     /**
      * Called by the Router to instantiate a new component.
      */
-    RouterOutlet.prototype.load = function (factory, providers, outletMap) {
+    RouterOutlet.prototype.activate = function (factory, providers, outletMap) {
         this.outletMap = outletMap;
         var inj = core_1.ReflectiveInjector.fromResolvedProviders(providers, this._location.parentInjector);
-        this._loaded = this._location.createComponent(factory, this._location.length, inj, []);
-        return this._loaded;
+        this._activated = this._location.createComponent(factory, this._location.length, inj, []);
+        return this._activated;
     };
+    /** @nocollapse */
     RouterOutlet.decorators = [
         { type: core_1.Directive, args: [{ selector: 'router-outlet' },] },
     ];
+    /** @nocollapse */
     RouterOutlet.ctorParameters = [
         { type: router_1.RouterOutletMap, },
         { type: core_1.ViewContainerRef, },

package/src/directives/router_outlet.js.map

@@ -1 +1 @@
-{"version":3,"file":"router_outlet.js","sourceRoot":"","sources":["../../../../../modules/@angular/router/src/directives/router_outlet.ts"],"names":[],"mappings":";AAIE,qBAUK,eAAe,CAAC,CAAA;AACvB,uBAA8B,WAAW,CAAC,CAAA;AAC1C,0BAAkC,cAAc,CAAC,CAAA;AACjD,qBAAiC,gBAAgB,CAAC,CAAA;AAClD;IAIE,sBAAY,eAAgC,EAAU,SAA2B,EAAE,IAAY;QAAzC,cAAS,GAAT,SAAS,CAAkB;QAC/E,eAAe,CAAC,cAAc,CAAC,cAAO,CAAC,IAAI,CAAC,GAAG,+BAAmB,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC;IACnF,CAAC;IAED,6BAAM,GAAN;QACE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,CAAC;IAKD,sBAAI,yCAAe;QAHnB;;WAEG;aACH,cAAgC,MAAM,CAAC,gBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC;;;OAAA;IAKhG,sBAAI,kCAAQ;QAHZ;;WAEG;aACH,cAA0B,MAAM,CAAC,gBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;;;OAAA;IAE3D;;OAEG;IACH,2BAAI,GAAJ,UAAK,OAA8B,EAAE,SAAuC,EACvE,SAA0B;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,GAAG,GAAG,yBAAkB,CAAC,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAC7F,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QACvF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACI,uBAAU,GAA0B;QAC3C,EAAE,IAAI,EAAE,gBAAS,EAAE,IAAI,EAAE,CAAC,EAAC,QAAQ,EAAE,eAAe,EAAC,EAAG,EAAE;KACzD,CAAC;IACK,2BAAc,GAA2D;QAChF,EAAC,IAAI,EAAE,wBAAe,GAAG;QACzB,EAAC,IAAI,EAAE,uBAAgB,GAAG;QAC1B,EAAC,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,gBAAS,EAAE,IAAI,EAAE,CAAC,MAAM,EAAG,EAAE,EAAG,EAAC;KACvE,CAAC;IACF,mBAAC;AAAD,CAAC,AAzCD,IAyCC;AAzCY,oBAAY,eAyCxB,CAAA","sourcesContent":["interface DecoratorInvocation {\n    type: Function;\n    args?: any[];\n  }\n  import {\n  ResolvedReflectiveProvider,\n  Directive,\n  DynamicComponentLoader,\n  ViewContainerRef,\n  Attribute,\n  ComponentRef,\n  ComponentFactory,\n  ReflectiveInjector,\n  OnInit\n} from '@angular/core';\nimport {RouterOutletMap} from '../router';\nimport {DEFAULT_OUTLET_NAME} from '../constants';\nimport {isPresent, isBlank} from '../facade/lang';\nexport class RouterOutlet {\n  private _loaded: ComponentRef<any>;\n  public outletMap: RouterOutletMap;\n\n  constructor(parentOutletMap: RouterOutletMap, private _location: ViewContainerRef, name: string) {\n    parentOutletMap.registerOutlet(isBlank(name) ? DEFAULT_OUTLET_NAME : name, this);\n  }\n\n  unload(): void {\n    this._loaded.destroy();\n    this._loaded = null;\n  }\n\n  /**\n   * Returns the loaded component.\n   */\n  get loadedComponent(): Object { return isPresent(this._loaded) ? this._loaded.instance : null; }\n\n  /**\n   * Returns true is the outlet is not empty.\n   */\n  get isLoaded(): boolean { return isPresent(this._loaded); }\n\n  /**\n   * Called by the Router to instantiate a new component.\n   */\n  load(factory: ComponentFactory<any>, providers: ResolvedReflectiveProvider[],\n       outletMap: RouterOutletMap): ComponentRef<any> {\n    this.outletMap = outletMap;\n    let inj = ReflectiveInjector.fromResolvedProviders(providers, this._location.parentInjector);\n    this._loaded = this._location.createComponent(factory, this._location.length, inj, []);\n    return this._loaded;\n  }\nstatic decorators: DecoratorInvocation[] = [\n{ type: Directive, args: [{selector: 'router-outlet'}, ] },\n];\nstatic ctorParameters: {type: Function, decorators?: DecoratorInvocation[]}[] = [\n{type: RouterOutletMap, },\n{type: ViewContainerRef, },\n{type: undefined, decorators: [{ type: Attribute, args: ['name', ] }, ]},\n];\n}\n"]}
+{"version":3,"file":"router_outlet.js","sourceRoot":"","sources":["../../../../../modules/@angular/router/src/directives/router_outlet.ts"],"names":[],"mappings":";AAAA,qBAAqI,eAAe,CAAC,CAAA;AAErJ,0BAAkC,cAAc,CAAC,CAAA;AACjD,qBAAiC,gBAAgB,CAAC,CAAA;AAClD,uBAA8B,WAAW,CAAC,CAAA;AAC1C;IAIE,sBACI,eAAgC,EAAU,SAA2B,EAAE,IAAY;QAAzC,cAAS,GAAT,SAAS,CAAkB;QACvE,eAAe,CAAC,cAAc,CAAC,cAAO,CAAC,IAAI,CAAC,GAAG,+BAAmB,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC;IACnF,CAAC;IAED,iCAAU,GAAV;QACE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QAC1B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;IAKD,sBAAI,mCAAS;QAHb;;WAEG;aACH,cAA0B,MAAM,CAAC,gBAAS,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC;;;OAAA;IAKhG,sBAAI,qCAAW;QAHf;;WAEG;aACH,cAA6B,MAAM,CAAC,gBAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;;;OAAA;IAEjE;;OAEG;IACH,+BAAQ,GAAR,UACI,OAA8B,EAAE,SAAuC,EACvE,SAA0B;QAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,GAAG,GAAG,yBAAkB,CAAC,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAC7F,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC1F,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IACH,kBAAkB;IACX,uBAAU,GAA0B;QAC3C,EAAE,IAAI,EAAE,gBAAS,EAAE,IAAI,EAAE,CAAC,EAAC,QAAQ,EAAE,eAAe,EAAC,EAAG,EAAE;KACzD,CAAC;IACF,kBAAkB;IACX,2BAAc,GAA2D;QAChF,EAAC,IAAI,EAAE,wBAAe,GAAG;QACzB,EAAC,IAAI,EAAE,uBAAgB,GAAG;QAC1B,EAAC,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,gBAAS,EAAE,IAAI,EAAE,CAAC,MAAM,EAAG,EAAE,EAAG,EAAC;KACvE,CAAC;IACF,mBAAC;AAAD,CAAC,AA7CD,IA6CC;AA7CY,oBAAY,eA6CxB,CAAA","sourcesContent":["import {Attribute, ComponentFactory, ComponentRef, Directive, ReflectiveInjector, ResolvedReflectiveProvider, ViewContainerRef} from '@angular/core';\n\nimport {DEFAULT_OUTLET_NAME} from '../constants';\nimport {isBlank, isPresent} from '../facade/lang';\nimport {RouterOutletMap} from '../router';\nexport class RouterOutlet {\n  private _activated: ComponentRef<any>;\n  public outletMap: RouterOutletMap;\n\n  constructor(\n      parentOutletMap: RouterOutletMap, private _location: ViewContainerRef, name: string) {\n    parentOutletMap.registerOutlet(isBlank(name) ? DEFAULT_OUTLET_NAME : name, this);\n  }\n\n  deactivate(): void {\n    this._activated.destroy();\n    this._activated = null;\n  }\n\n  /**\n   * Returns the loaded component.\n   */\n  get component(): Object { return isPresent(this._activated) ? this._activated.instance : null; }\n\n  /**\n   * Returns true is the outlet is not empty.\n   */\n  get isActivated(): boolean { return isPresent(this._activated); }\n\n  /**\n   * Called by the Router to instantiate a new component.\n   */\n  activate(\n      factory: ComponentFactory<any>, providers: ResolvedReflectiveProvider[],\n      outletMap: RouterOutletMap): ComponentRef<any> {\n    this.outletMap = outletMap;\n    let inj = ReflectiveInjector.fromResolvedProviders(providers, this._location.parentInjector);\n    this._activated = this._location.createComponent(factory, this._location.length, inj, []);\n    return this._activated;\n  }\n/** @nocollapse */\nstatic decorators: DecoratorInvocation[] = [\n{ type: Directive, args: [{selector: 'router-outlet'}, ] },\n];\n/** @nocollapse */\nstatic ctorParameters: {type: Function, decorators?: DecoratorInvocation[]}[] = [\n{type: RouterOutletMap, },\n{type: ViewContainerRef, },\n{type: undefined, decorators: [{ type: Attribute, args: ['name', ] }, ]},\n];\n}\n\ninterface DecoratorInvocation {\n  type: Function;\n  args?: any[];\n}\n"]}

package/src/directives/router_outlet.metadata.json

@@ -1 +1 @@
-{"__symbolic":"module","metadata":{"RouterOutlet":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","name":"Directive","module":"@angular/core"},"arguments":[{"selector":"router-outlet"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[null,null,[{"__symbolic":"call","expression":{"__symbolic":"reference","name":"Attribute","module":"@angular/core"},"arguments":["name"]}]],"parameters":[{"__symbolic":"reference","name":"RouterOutletMap","module":"../router"},{"__symbolic":"reference","name":"ViewContainerRef","module":"@angular/core"},null]}]}}}}
+{"__symbolic":"module","version":1,"metadata":{"RouterOutlet":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Directive"},"arguments":[{"selector":"router-outlet"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[null,null,[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Attribute"},"arguments":["name"]}]],"parameters":[{"__symbolic":"reference","module":"../router","name":"RouterOutletMap"},{"__symbolic":"reference","module":"@angular/core","name":"ViewContainerRef"},{"__symbolic":"reference","name":"string"}]}],"deactivate":[{"__symbolic":"method"}],"activate":[{"__symbolic":"method"}]}}}}

package/src/facade/async.d.ts

@@ -1,8 +1,8 @@
-export { PromiseWrapper, PromiseCompleter } from './promise';
 import { Observable } from 'rxjs/Observable';
 import { Subject } from 'rxjs/Subject';
 export { Observable } from 'rxjs/Observable';
 export { Subject } from 'rxjs/Subject';
+export { PromiseCompleter, PromiseWrapper } from './promise';
 export declare class TimerWrapper {
     static setTimeout(fn: (...args: any[]) => void, millis: number): number;
     static clearTimeout(id: number): void;
@@ -61,14 +61,21 @@ export declare class ObservableWrapper {
  * }
  * ```
  *
- * Use Rx.Observable but provides an adapter to make it work as specified here:
+ * The events payload can be accessed by the parameter `$event` on the components output event
+ * handler:
+ *
+ * ```
+ * <zippy (open)="onOpen($event)" (close)="onClose($event)"></zippy>
+ * ```
+ *
+ * Uses Rx.Observable but provides an adapter to make it work as specified here:
  * https://github.com/jhusain/observable-spec
  *
  * Once a reference implementation of the spec is available, switch to it.
+ * @stable
  */
 export declare class EventEmitter<T> extends Subject<T> {
-    /** @internal */
-    _isAsync: boolean;
+    __isAsync: boolean;
     /**
      * Creates an instance of [EventEmitter], which depending on [isAsync],
      * delivers events synchronously or asynchronously.

package/src/facade/async.js

@@ -4,17 +4,17 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var lang_1 = require('./lang');
-var promise_1 = require('./promise');
-exports.PromiseWrapper = promise_1.PromiseWrapper;
-exports.PromiseCompleter = promise_1.PromiseCompleter;
 var Subject_1 = require('rxjs/Subject');
 var PromiseObservable_1 = require('rxjs/observable/PromiseObservable');
 var toPromise_1 = require('rxjs/operator/toPromise');
+var lang_1 = require('./lang');
 var Observable_1 = require('rxjs/Observable');
 exports.Observable = Observable_1.Observable;
 var Subject_2 = require('rxjs/Subject');
 exports.Subject = Subject_2.Subject;
+var promise_1 = require('./promise');
+exports.PromiseCompleter = promise_1.PromiseCompleter;
+exports.PromiseWrapper = promise_1.PromiseWrapper;
 var TimerWrapper = (function () {
     function TimerWrapper() {
     }
@@ -35,8 +35,8 @@ var ObservableWrapper = (function () {
     // TODO(vsavkin): when we use rxnext, try inferring the generic type from the first arg
     ObservableWrapper.subscribe = function (emitter, onNext, onError, onComplete) {
         if (onComplete === void 0) { onComplete = function () { }; }
-        onError = (typeof onError === "function") && onError || lang_1.noop;
-        onComplete = (typeof onComplete === "function") && onComplete || lang_1.noop;
+        onError = (typeof onError === 'function') && onError || lang_1.noop;
+        onComplete = (typeof onComplete === 'function') && onComplete || lang_1.noop;
         return emitter.subscribe({ next: onNext, error: onError, complete: onComplete });
     };
     ObservableWrapper.isObservable = function (obs) { return !!obs.subscribe; };
@@ -93,10 +93,18 @@ exports.ObservableWrapper = ObservableWrapper;
  * }
  * ```
  *
- * Use Rx.Observable but provides an adapter to make it work as specified here:
+ * The events payload can be accessed by the parameter `$event` on the components output event
+ * handler:
+ *
+ * ```
+ * <zippy (open)="onOpen($event)" (close)="onClose($event)"></zippy>
+ * ```
+ *
+ * Uses Rx.Observable but provides an adapter to make it work as specified here:
  * https://github.com/jhusain/observable-spec
  *
  * Once a reference implementation of the spec is available, switch to it.
+ * @stable
  */
 var EventEmitter = (function (_super) {
     __extends(EventEmitter, _super);
@@ -105,9 +113,9 @@ var EventEmitter = (function (_super) {
      * delivers events synchronously or asynchronously.
      */
     function EventEmitter(isAsync) {
-        if (isAsync === void 0) { isAsync = true; }
+        if (isAsync === void 0) { isAsync = false; }
         _super.call(this);
-        this._isAsync = isAsync;
+        this.__isAsync = isAsync;
     }
     EventEmitter.prototype.emit = function (value) { _super.prototype.next.call(this, value); };
     /**
@@ -119,27 +127,29 @@ var EventEmitter = (function (_super) {
         var errorFn = function (err) { return null; };
         var completeFn = function () { return null; };
         if (generatorOrNext && typeof generatorOrNext === 'object') {
-            schedulerFn = this._isAsync ? function (value) { setTimeout(function () { return generatorOrNext.next(value); }); } :
-                function (value) { generatorOrNext.next(value); };
+            schedulerFn = this.__isAsync ? function (value /** TODO #9100 */) {
+                setTimeout(function () { return generatorOrNext.next(value); });
+            } : function (value /** TODO #9100 */) { generatorOrNext.next(value); };
             if (generatorOrNext.error) {
-                errorFn = this._isAsync ? function (err) { setTimeout(function () { return generatorOrNext.error(err); }); } :
+                errorFn = this.__isAsync ? function (err) { setTimeout(function () { return generatorOrNext.error(err); }); } :
                     function (err) { generatorOrNext.error(err); };
             }
             if (generatorOrNext.complete) {
-                completeFn = this._isAsync ? function () { setTimeout(function () { return generatorOrNext.complete(); }); } :
+                completeFn = this.__isAsync ? function () { setTimeout(function () { return generatorOrNext.complete(); }); } :
                     function () { generatorOrNext.complete(); };
             }
         }
         else {
-            schedulerFn = this._isAsync ? function (value) { setTimeout(function () { return generatorOrNext(value); }); } :
-                function (value) { generatorOrNext(value); };
+            schedulerFn = this.__isAsync ? function (value /** TODO #9100 */) {
+                setTimeout(function () { return generatorOrNext(value); });
+            } : function (value /** TODO #9100 */) { generatorOrNext(value); };
             if (error) {
                 errorFn =
-                    this._isAsync ? function (err) { setTimeout(function () { return error(err); }); } : function (err) { error(err); };
+                    this.__isAsync ? function (err) { setTimeout(function () { return error(err); }); } : function (err) { error(err); };
             }
             if (complete) {
                 completeFn =
-                    this._isAsync ? function () { setTimeout(function () { return complete(); }); } : function () { complete(); };
+                    this.__isAsync ? function () { setTimeout(function () { return complete(); }); } : function () { complete(); };
             }
         }
         return _super.prototype.subscribe.call(this, schedulerFn, errorFn, completeFn);