javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 12:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into alpha38

Browse Source 
Conflicts:
	ionic/config/decorators.ts
This commit is contained in:
Adam Bradley
2015-10-07 13:56:16 -05:00
parent 26e3554d56
commit 02f04c7322
6 changed files with 96 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
demos/component-docs/index.ts
View File

@ -1,6 +1,6 @@
import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/forms';
import {App, IonicApp, ActionSheet, NavController, NavParams} from 'ionic/ionic';
import {Modal, IonicView, IonicConfig, Events, Animation} from 'ionic/ionic';
import {Popup, Modal, IonicView, IonicConfig, Events, Animation} from 'ionic/ionic';
import {NavigationDetailsPage} from 'navigation';
import {TabsPage} from 'tabs';
@ -20,12 +20,14 @@ export class MainPage {
nav: NavController,
actionSheet: ActionSheet,
params: NavParams,
popup: Popup,
modal: Modal,
events: Events)
{
this.params = params;
this.nav = nav;
this.modal = modal;
this.popup = popup;
this.actionSheet = actionSheet;
this.navDetailsPage = NavigationDetailsPage;
this.demoModal = DemoModal;
@ -41,7 +43,8 @@ export class MainPage {
zone.run(() => {
if (e.data) {
var data = JSON.parse(e.data);
this.component.title = helpers.toTitleCase(data.hash.replace('-', ' '));
this.component.title = helpers.toTitleCase(data.hash.replace(/-/g, ' '));
console.log(this.component.title);
if (this.component.title === 'Tabs') {
this.nav.setRoot(TabsPage);
}
@ -102,6 +105,15 @@ export class MainPage {
});
}
// **************************
// Popup
// **************************
showPopup() {
this.popup.alert("Popup Title").then(() => {
});
}
// **************************
// Form
// **************************