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

alpha38, first pass

Browse Source
This commit is contained in:
Adam Bradley
2015-10-03 16:02:24 -05:00
parent 0358d1b162
commit 5345d10f21
40 changed files with 40 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demos/barkpark/index.ts
View File

@ -1,4 +1,4 @@
import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
import {FormBuilder, Validators, ControlGroup} from 'angular2/angular2';
import {Log} from 'ionic/util'
import {App, IonicView, NavController} from 'ionic/ionic'

5
demos/i18n/index.ts
View File

@ -1,10 +1,9 @@
import {Component} from 'angular2/angular2';
import {Control, ControlGroup} from 'angular2/forms';
import {Component, Control, ControlGroup} from 'angular2/angular2';
import {IonicApp, App, Http} from 'ionic/ionic';
import {Translate, TranslatePipe} from 'ionic/ionic';
@App({
templateUrl: 'main.html',
pipes: [TranslatePipe]

3
demos/music/index.ts
View File

@ -1,5 +1,4 @@
import {Directive, ElementRef} from 'angular2/angular2';
import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
import {Directive, ElementRef, FormBuilder, Validators, ControlGroup} from 'angular2/angular2';
import {App, NavController, IonicView} from 'ionic/ionic';

3
demos/native/index.ts
View File

@ -1,5 +1,4 @@
import {Component} from 'angular2/angular2';
import {Control, ControlGroup} from 'angular2/forms';
import {Component, Control, ControlGroup} from 'angular2/angular2';
import {IonicApp, App, Http} from 'ionic/ionic';

3
demos/net/index.ts
View File

@ -1,5 +1,4 @@
import {Component} from 'angular2/angular2';
import {Control, ControlGroup} from 'angular2/forms';
import {Component, Control, ControlGroup} from 'angular2/angular2';
import {App, Http} from 'ionic/ionic';

5
demos/profile/index.ts
View File

@ -1,6 +1,5 @@
import {ElementRef} from 'angular2/angular2'
import {Component, Directive} from 'angular2/angular2';
import {FormBuilder, Control, ControlGroup, Validators} from 'angular2/forms';
import {ElementRef, Component, Directive} from 'angular2/angular2';
import {FormBuilder, Control, ControlGroup, Validators} from 'angular2/angular2';
import {App, Modal, Animation, Content} from 'ionic/ionic';
import {NavController, NavParams, IonicView} from 'ionic/ionic';

3
demos/sink/pages/search-bar.ts
View File

@ -1,5 +1,4 @@
import {Component} from 'angular2/angular2';
import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
import {Component, FormBuilder, Validators, ControlGroup} from 'angular2/angular2';
import {IonicApp, IonicView} from 'ionic/ionic';

3
demos/sink/pages/table-search.ts
View File

@ -1,5 +1,4 @@
import {Component} from 'angular2/angular2';
import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
import {Component, FormBuilder, Validators, ControlGroup} from 'angular2/angular2';
import {IonicView} from 'ionic/ionic';

2
demos/sink/pages/tabs.ts
View File

@ -1,4 +1,4 @@
import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
import {FormBuilder, Validators, ControlGroup} from 'angular2/angular2';
import {IonicApp, IonicView, NavController} from 'ionic/ionic';

2
demos/snapcat/index.ts
View File

@ -1,4 +1,4 @@
import {FormBuilder, Control, ControlGroup, Validators} from 'angular2/forms';
import {FormBuilder, Control, ControlGroup, Validators} from 'angular2/angular2';
import {App, IonicView, Animation, Modal, NavController, NavParams} from 'ionic/ionic';

3
demos/storage/index.ts
View File

@ -1,5 +1,4 @@
import {Component} from 'angular2/angular2';
import {Control, ControlGroup} from 'angular2/forms';
import {Component, Control, ControlGroup} from 'angular2/angular2';
import {App, Http, Storage, LocalStorage, SqlStorage} from 'ionic/ionic';

6
demos/weather/index.ts
View File

@ -1,6 +1,5 @@
import {Component, Directive, View} from 'angular2/angular2';
import {NgIf, NgFor, NgClass, ElementRef} from 'angular2/angular2';
import {FormBuilder, Control, ControlGroup, Validators, FORM_DIRECTIVES} from 'angular2/forms';
import {Component, Directive, View, NgIf, NgFor, NgClass, ElementRef} from 'angular2/angular2';
import {FormBuilder, Control, ControlGroup, Validators, FORM_DIRECTIVES} from 'angular2/angular2';
import {App, IonicView, Animation, Content, Scroll, Modal, NavController, NavParams} from 'ionic/ionic';
@ -9,7 +8,6 @@ import {Weather} from './weather';
import {Flickr} from './flickr';
@IonicView({
template: `<ion-view id="settings-modal">
<ion-toolbar><ion-title>Settings</ion-title></ion-toolbar>

2
ionic/components/checkbox/test/basic/index.ts
View File

@ -9,7 +9,7 @@ import {
NgControlName,
NgFormModel,
FormBuilder
} from 'angular2/forms';
} from 'angular2/angular2';
@App({
templateUrl: 'main.html'

5
ionic/components/nav/nav-controller.ts
View File

@ -1,7 +1,4 @@
import {Component, ComponentRef, Compiler, ElementRef, Injector, bind, NgZone} from 'angular2/angular2';
import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader';
import {DirectiveBinding} from 'angular2/src/core/compiler/element_injector';
import {AppViewManager} from 'angular2/src/core/compiler/view_manager';
import {Component, ComponentRef, Compiler, ElementRef, Injector, bind, NgZone, DynamicComponentLoader, DirectiveBinding, AppViewManager} from 'angular2/angular2';
import {Ion} from '../ion';
import {IonicConfig} from '../../config/config';

3
ionic/components/nav/nav.ts
View File

@ -1,5 +1,4 @@
import {Component, Directive, View, ElementRef, Host, Optional, forwardRef, Inject, Injector, NgZone, Renderer} from 'angular2/angular2';
import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
import {Component, Directive, View, ElementRef, Host, Optional, forwardRef, Inject, Injector, NgZone, Renderer, ViewContainerRef} from 'angular2/angular2';
import {IonicComponent} from '../../config/decorators';
import {NavController} from './nav-controller';

3
ionic/components/overlay/overlay.ts
View File

@ -1,5 +1,4 @@
import {Component} from 'angular2/angular2';
import {DirectiveBinding} from 'angular2/src/core/compiler/element_injector';
import {Component, DirectiveBinding} from 'angular2/angular2';
import {IonicApp} from '../app/app';
import {Animation} from '../../animations/animation';

2
ionic/components/radio/test/basic/index.ts
View File

@ -9,7 +9,7 @@ import {
NgControlName,
NgFormModel,
FormBuilder
} from 'angular2/forms';
} from 'angular2/angular2';
@App({

1
ionic/components/search-bar/search-bar.ts
View File

@ -1,5 +1,4 @@
import {ElementRef, Pipe} from 'angular2/angular2';
//import {ControlGroup, ControlDirective} from 'angular2/forms'
import {Ion} from '../ion';
import {IonicConfig} from '../../config/config';

2
ionic/components/search-bar/test/basic/index.ts
View File

@ -1,4 +1,4 @@
import {FormBuilder, Validators, Control, ControlGroup} from 'angular2/forms';
import {FormBuilder, Validators, Control, ControlGroup} from 'angular2/angular2';
import {App} from 'ionic/ionic';
import {SearchPipe} from 'ionic/components/search-bar/search-bar';

3
ionic/components/segment/segment.ts
View File

@ -1,6 +1,5 @@
import {View, Renderer, ElementRef, EventEmitter, Host, forwardRef, Optional} from 'angular2/angular2';
import {Control, NgControl,NgFormControl} from 'angular2/forms';
import {ControlGroup, ControlDirective} from 'angular2/forms'
import {Control, NgControl, NgFormControl, ControlGroup, ControlDirective} from 'angular2/angular2';
import {Ion} from '../ion';
import {IonicConfig} from '../../config/config';

2
ionic/components/segment/test/basic/index.ts
View File

@ -1,4 +1,4 @@
import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/forms';
import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/angular2';
import {App} from 'ionic/ionic';

2
ionic/components/show-hide-when/test/basic/index.ts
View File

@ -9,7 +9,7 @@ import {
NgControlName,
NgFormModel,
FormBuilder
} from 'angular2/forms';
} from 'angular2/angular2';
@App({
templateUrl: 'main.html'

2
ionic/components/switch/test/basic/index.ts
View File

@ -9,7 +9,7 @@ import {
NgControlName,
NgFormModel,
FormBuilder
} from 'angular2/forms';
} from 'angular2/angular2';
@App({
templateUrl: 'main.html'

3
ionic/components/tabs/tab.ts
View File

@ -1,5 +1,4 @@
import {Directive, Component, View, Host, ElementRef, forwardRef, Injector, NgZone} from 'angular2/angular2';
import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
import {Directive, Component, View, Host, ElementRef, forwardRef, Injector, NgZone, ViewContainerRef} from 'angular2/angular2';
import {NavController} from '../nav/nav-controller';
import {ViewController} from '../nav/view-controller';

3
ionic/components/tabs/tabs.ts
View File

@ -1,5 +1,4 @@
import {Component, Directive, View, Injector, NgFor, ElementRef, Optional, Host, forwardRef, NgZone} from 'angular2/angular2';
import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
import {Component, Directive, View, Injector, NgFor, ElementRef, Optional, Host, forwardRef, NgZone, ViewContainerRef} from 'angular2/angular2';
import {Ion} from '../ion';
import {IonicApp} from '../app/app';

3
ionic/platform/applinks/applinks.ts
View File

@ -1,6 +1,3 @@
import * as Rx from 'rx';
import * as util from 'ionic/util';
import {NativePlugin} from '../plugin';
/**

3
ionic/platform/barcode/barcode.ts
View File

@ -1,6 +1,3 @@
import * as Rx from 'rx';
import * as util from 'ionic/util';
import {NativePlugin} from '../plugin';
/**

3
ionic/platform/camera-roll/camera-roll.ts
View File

@ -1,6 +1,3 @@
import * as Rx from 'rx';
import * as util from 'ionic/util';
import {NativePlugin} from '../plugin';
/**

3
ionic/platform/contacts/contacts.ts
View File

@ -1,6 +1,3 @@
import * as Rx from 'rx';
import * as util from 'ionic/util';
import {NativePlugin} from '../plugin';
/**

4
ionic/platform/device-motion/device-motion.ts
View File

@ -1,4 +1,6 @@
import * as Rx from 'rx';
// TODO: temporary until https://github.com/angular/angular/issues/4390 decided
// var Rx = require('@reactivex/rxjs/dist/cjs/Rx');
// var {Observable} = Rx;
import * as util from 'ionic/util';
import {NativePlugin} from '../plugin';

4
ionic/platform/device-orientation/device-orientation.ts
View File

@ -1,4 +1,6 @@
import * as Rx from 'rx';
// TODO: temporary until https://github.com/angular/angular/issues/4390 decided
// var Rx = require('@reactivex/rxjs/dist/cjs/Rx');
// var {Observable} = Rx;
import * as util from 'ionic/util';
import {NativePlugin} from '../plugin';

3
ionic/platform/device/device.ts
View File

@ -1,6 +1,3 @@
import * as Rx from 'rx';
import * as util from 'ionic/util';
import {NativePlugin} from '../plugin';

3
ionic/platform/dialogs/dialogs.ts
View File

@ -1,6 +1,3 @@
import * as Rx from 'rx';
import * as util from 'ionic/util';
import {NativePlugin} from '../plugin';
/**

5
ionic/platform/geolocation/geolocation.ts
View File

@ -1,6 +1,7 @@
import * as Rx from 'rx';
// TODO: temporary until https://github.com/angular/angular/issues/4390 decided
// var Rx = require('@reactivex/rxjs/dist/cjs/Rx');
// var {Observable} = Rx;
import * as util from 'ionic/util';
import {NativePlugin} from '../plugin';
/**

3
ionic/platform/keyboard/keyboard.ts
View File

@ -1,6 +1,3 @@
import * as Rx from 'rx';
import * as util from 'ionic/util';
import {NativePlugin} from '../plugin';
/**

3
ionic/platform/loading/loading.ts
View File

@ -1,6 +1,3 @@
import * as Rx from 'rx';
import * as util from 'ionic/util';
import {NativePlugin} from '../plugin';
/**

3
ionic/platform/network/network.ts
View File

@ -1,6 +1,3 @@
import * as Rx from 'rx';
import * as util from 'ionic/util';
import {NativePlugin} from '../plugin';
/**

3
ionic/platform/statusbar/statusbar.ts
View File

@ -1,6 +1,3 @@
import * as Rx from 'rx';
import * as util from 'ionic/util';
import {NativePlugin} from '../plugin';
/**

3
ionic/platform/vibration/vibration.ts
View File

@ -1,6 +1,3 @@
import * as Rx from 'rx';
import * as util from 'ionic/util';
import {NativePlugin} from '../plugin';
/**

11
package.json
View File

@ -7,14 +7,10 @@
"url": "https://github.com/driftyco/ionic2.git"
},
"dependencies": {
"angular2": "2.0.0-alpha.37",
"angular2": "2.0.0-alpha.38",
"@reactivex/rxjs": "0.0.0-prealpha.3",
"reflect-metadata": "0.1.1",
"rtts_assert": "2.0.0-alpha.37",
"rx": "2.5.1",
"swiper": "^3.1.2",
"systemjs": "0.18.10",
"traceur": "0.0.91",
"zone.js": "0.5.4"
"zone.js": "0.5.7"
},
"devDependencies": {
"canonical-path": "0.0.2",
@ -59,6 +55,7 @@
"semver": "^5.0.1",
"serve-static": "^1.9.2",
"source-map-support": "^0.2.10",
"systemjs": "0.18.10",
"through2": "^0.6.3",
"traceur-runtime": "0.0.59",
"typescript": "1.5.3",