javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(build): make update-angular script actually update angular

Browse Source
This commit is contained in:
Andrew
2015-03-30 12:12:13 -06:00
parent 4a5ec08fe5
commit d1be210f9f
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/build/update-angular.sh
View File

@ -7,6 +7,9 @@ cd $(dirname $0)/../../
$(test -e $NG_FOLDER) || (git clone git@github.com:angular/angular $NG_FOLDER) $(test -e $NG_FOLDER) || (git clone git@github.com:angular/angular $NG_FOLDER)
cd $NG_FOLDER cd $NG_FOLDER
echo "Pulling from master.."
git pull origin master
echo "Running npm install in angular2..." echo "Running npm install in angular2..."
npm install npm install

37
src/components/nav-view/test/basic/main.js
View File

@ -1,19 +1,40 @@
import {bootstrap} from 'angular2/core'; import {bootstrap} from 'angular2/core'
import {Component, Template, NgElement, Parent} from 'angular2/angular2'; import {Component, Template, NgElement, Parent} from 'angular2/angular2'
import {NavView} from 'ionic2/components/nav-view/nav-view'; import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver'
import {View} from 'ionic2/components/view/view'; import {Compiler} from 'angular2/src/core/compiler/compiler'
import {Log} from 'ionic2/util'; 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({ @Component({
selector: 'my-page', selector: 'my-page',
services: [TemplateResolver, Compiler]
}) })
@Template({ @Template({
inline: "<div><h2>I'm a page!</h2><content></content></div>" inline: "<div><h2>I'm a page!</h2><content></content></div>"
}) })
export class MyPage extends View { export class MyPage extends View {
constructor(@NgElement() ele:NgElement, @Parent() nav: NavView) { constructor(
Log.log('Page constructed!', ele, nav) @NgElement() ele:NgElement,
super(ele, nav) compiler: Compiler,
hostElementInjector: ElementInjector,
eventManager: EventManager
) {
super(ele)
compiler.compile(InsidePage).then(function(protoView) {
debugger;
})
} }
} }