javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 13:32:54 +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

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

@ -1,8 +1,8 @@
import {ViewEncapsulation} from '@angular/core';
import {App, Page, Picker, NavController} from '../../../../../src';
import {Component, ViewEncapsulation} from '@angular/core';
import {ionicBootstrap, Picker, NavController} from '../../../../../src';
@Page({
@Component({
templateUrl: 'main.html',
encapsulation: ViewEncapsulation.None,
})
@ -210,12 +210,11 @@ class E2EPage {
}
@App({
@Component({
template: '<ion-nav [root]="root"></ion-nav>'
})
class E2EApp {
root;
constructor() {
this.root = E2EPage;
}
root = E2EPage;
}
ionicBootstrap(E2EApp);