From 72ad5c1fb583715527c8f10077aa9e2a7df4dfc7 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Thu, 8 Oct 2015 23:54:50 -0500 Subject: [PATCH] init alpha40 --- ionic/config/decorators.ts | 12 +++++++----- package.json | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ionic/config/decorators.ts b/ionic/config/decorators.ts index f53652a132..8bf56c3e38 100644 --- a/ionic/config/decorators.ts +++ b/ionic/config/decorators.ts @@ -125,17 +125,19 @@ export function App(args={}) { // get current annotations let annotations = Reflect.getMetadata('annotations', cls) || []; - // create @Component + // default to select args.selector = args.selector || 'ion-app'; - annotations.push(new Component(args)); - // create @View - // if no template was provided, default so it has a root ion-nav + // auto add Ionic directives + args.directives = args.directives ? args.directives.concat(IONIC_DIRECTIVES) : IONIC_DIRECTIVES; + + // if no template was provided, default so it has a root if (!args.templateUrl && !args.template) { args.template = ''; } - annotations.push(new PageImpl(args)); + // create @Component + annotations.push(new Component(args)); // redefine with added annotations Reflect.defineMetadata('annotations', annotations, cls); diff --git a/package.json b/package.json index d4b4796d9a..d40f6f4e99 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "link": "npm install && gulp src && npm link" }, "dependencies": { - "angular2": "2.0.0-alpha.39", + "angular2": "2.0.0-alpha.40", "@reactivex/rxjs": "0.0.0-prealpha.3", "reflect-metadata": "0.1.1", "zone.js": "0.5.8"