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 branch 'bootstrap-refactor' into 2.0

Browse Source
This commit is contained in:
Adam Bradley
2016-05-31 15:50:21 -05:00
parent 6bd91f02a3 774ab83637
commit 8a920a24a5
198 changed files with 1644 additions and 1637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/datetime/datetime.ts
View File

@@ -193,14 +193,14 @@ const DATETIME_VALUE_ACCESSOR = new Provider(
* ### App Config Level
*
* ```ts
* @App({
* config: {
* monthNames: ['janeiro', 'fevereiro', 'mar\u00e7o', ... ],
* monthShortNames: ['jan', 'fev', 'mar', ... ],
* dayNames: ['domingo', 'segunda-feira', 'ter\u00e7a-feira', ... ],
* dayShortNames: ['dom', 'seg', 'ter', ... ],
* }
* })
* import {ionicBootstrap} from 'ionic-angular';
*
* ionicBootstrap(MyApp, customProviders, {
* monthNames: ['janeiro', 'fevereiro', 'mar\u00e7o', ... ],
* monthShortNames: ['jan', 'fev', 'mar', ... ],
* dayNames: ['domingo', 'segunda-feira', 'ter\u00e7a-feira', ... ],
* dayShortNames: ['dom', 'seg', 'ter', ... ],
* });
* ```
*
* ### Component Input Level

15
src/components/datetime/test/basic/index.ts
View File

@@ -1,7 +1,8 @@
import {App, Page} from '../../../../../src';
import {Component} from '@angular/core';
import {ionicBootstrap} from '../../../../../src';
@Page({
@Component({
templateUrl: 'main.html'
})
class E2EPage {
@@ -37,13 +38,11 @@ class E2EPage {
}
@App({
@Component({
template: '<ion-nav [root]="root"></ion-nav>'
})
class E2EApp {
root;
constructor() {
this.root = E2EPage;
}
root = E2EPage;
}
ionicBootstrap(E2EApp);