javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into es6-shims

Browse Source
This commit is contained in:
jbavari
2015-10-16 12:18:17 -06:00
parent 597192659e be6cee3f84
commit 28b7332e2f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
import {App, IonicApp, Platform, ActionSheet} from 'ionic/ionic';
import {App, IonicApp, IonicPlatform, ActionSheet} from 'ionic/ionic';
import {Page, Config, Events} from 'ionic/ionic';
import {ActionSheetPage} from './actionSheet/actionSheet';
import * as helpers from './helpers';
@@ -11,7 +11,7 @@ class DemoApp {
rootPage: any;
constructor(app: IonicApp, platform: Platform) {
constructor(app: IonicApp, platform: IonicPlatform) {
this.app = app;
this.platform = platform;

6
demos/component-docs/popups/popups.html
View File

@@ -4,8 +4,8 @@
</ion-navbar>
<ion-content padding class="has-header">
<button (click)="doAlert()">Alert</button>
<button (click)="doPrompt()">Prompt</button>
<button (click)="doConfirm()">Confirm</button>
<button dark (click)="doAlert()">Alert</button>
<button light (click)="doPrompt()">Prompt</button>
<button primary (click)="doConfirm()">Confirm</button>
</ion-content>