diff --git a/scripts/build/update-angular.sh b/scripts/build/update-angular.sh index b2fadc019b..1f66fc2f3d 100755 --- a/scripts/build/update-angular.sh +++ b/scripts/build/update-angular.sh @@ -7,6 +7,9 @@ cd $(dirname $0)/../../ $(test -e $NG_FOLDER) || (git clone git@github.com:angular/angular $NG_FOLDER) cd $NG_FOLDER +echo "Pulling from master.." +git pull origin master + echo "Running npm install in angular2..." npm install diff --git a/src/components/nav-view/test/basic/main.js b/src/components/nav-view/test/basic/main.js index 50afa8263d..646920a7d4 100644 --- a/src/components/nav-view/test/basic/main.js +++ b/src/components/nav-view/test/basic/main.js @@ -1,19 +1,40 @@ -import {bootstrap} from 'angular2/core'; -import {Component, Template, NgElement, Parent} from 'angular2/angular2'; -import {NavView} from 'ionic2/components/nav-view/nav-view'; -import {View} from 'ionic2/components/view/view'; -import {Log} from 'ionic2/util'; +import {bootstrap} from 'angular2/core' +import {Component, Template, NgElement, Parent} from 'angular2/angular2' +import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver' +import {Compiler} from 'angular2/src/core/compiler/compiler' +import {ElementInjector} from 'angular2/src/core/compiler/element_injector' +import {EventManager} from 'angular2/src/core/events/event_manager' +import {NavView} from 'ionic2/components/nav-view/nav-view' +import {View} from 'ionic2/components/view/view' +import {Log} from 'ionic2/util' + +@Component({ + selector: 'my-page' +}) +@Template({ + inline: 'Hello, inside page!' +}) +export class InsidePage { +} @Component({ selector: 'my-page', + services: [TemplateResolver, Compiler] }) @Template({ inline: "