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

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	demos/component-docs/menus/menus.html
This commit is contained in:
Brandy Carney
2015-10-08 15:18:24 -04:00
parent c2d56d8623 0171f84cc1
commit e7d1bb9812
18 changed files with 157 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
demos/component-docs/modals/modals.ts
View File

@ -1,8 +1,8 @@
import {App, IonicApp, Animation, Modal, NavController, IonicView, Events} from 'ionic/ionic';
import {App, IonicApp, Animation, Modal, NavController, Page, Events} from 'ionic/ionic';
import * as helpers from 'helpers';
@IonicView({
@Page({
templateUrl: 'modals/modals.html'
})
class ModalsFirstPage {
@ -26,7 +26,7 @@ class ModalsFirstPage {
}
@IonicView({
@Page({
templateUrl: 'modals/modals-content.html'
})
class ModalsContentPage {
@ -46,7 +46,7 @@ class ModalsContentPage {
}
}
@IonicView({
@Page({
template: '<ion-nav [root]="rootView"></ion-nav>'
})
export class ModalsPage {