From 5345d10f21231f3e7d37fe77cb85286ccede3ba3 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Sat, 3 Oct 2015 16:02:24 -0500 Subject: [PATCH] alpha38, first pass --- demos/barkpark/index.ts | 2 +- demos/i18n/index.ts | 5 ++--- demos/music/index.ts | 3 +-- demos/native/index.ts | 3 +-- demos/net/index.ts | 3 +-- demos/profile/index.ts | 5 ++--- demos/sink/pages/search-bar.ts | 3 +-- demos/sink/pages/table-search.ts | 3 +-- demos/sink/pages/tabs.ts | 2 +- demos/snapcat/index.ts | 2 +- demos/storage/index.ts | 3 +-- demos/weather/index.ts | 6 ++---- ionic/components/checkbox/test/basic/index.ts | 2 +- ionic/components/nav/nav-controller.ts | 5 +---- ionic/components/nav/nav.ts | 3 +-- ionic/components/overlay/overlay.ts | 3 +-- ionic/components/radio/test/basic/index.ts | 2 +- ionic/components/search-bar/search-bar.ts | 1 - ionic/components/search-bar/test/basic/index.ts | 2 +- ionic/components/segment/segment.ts | 3 +-- ionic/components/segment/test/basic/index.ts | 2 +- ionic/components/show-hide-when/test/basic/index.ts | 2 +- ionic/components/switch/test/basic/index.ts | 2 +- ionic/components/tabs/tab.ts | 3 +-- ionic/components/tabs/tabs.ts | 3 +-- ionic/platform/applinks/applinks.ts | 3 --- ionic/platform/barcode/barcode.ts | 3 --- ionic/platform/camera-roll/camera-roll.ts | 3 --- ionic/platform/contacts/contacts.ts | 3 --- ionic/platform/device-motion/device-motion.ts | 4 +++- .../platform/device-orientation/device-orientation.ts | 4 +++- ionic/platform/device/device.ts | 3 --- ionic/platform/dialogs/dialogs.ts | 3 --- ionic/platform/geolocation/geolocation.ts | 5 +++-- ionic/platform/keyboard/keyboard.ts | 3 --- ionic/platform/loading/loading.ts | 3 --- ionic/platform/network/network.ts | 3 --- ionic/platform/statusbar/statusbar.ts | 3 --- ionic/platform/vibration/vibration.ts | 3 --- package.json | 11 ++++------- 40 files changed, 40 insertions(+), 90 deletions(-) diff --git a/demos/barkpark/index.ts b/demos/barkpark/index.ts index e5cc3adcc1..98fefe14d1 100644 --- a/demos/barkpark/index.ts +++ b/demos/barkpark/index.ts @@ -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' diff --git a/demos/i18n/index.ts b/demos/i18n/index.ts index bdf66c9b61..89abd22a45 100644 --- a/demos/i18n/index.ts +++ b/demos/i18n/index.ts @@ -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] diff --git a/demos/music/index.ts b/demos/music/index.ts index d8bbd171e4..8099c8d2a5 100644 --- a/demos/music/index.ts +++ b/demos/music/index.ts @@ -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'; diff --git a/demos/native/index.ts b/demos/native/index.ts index 69f97032f4..317c09d1f2 100644 --- a/demos/native/index.ts +++ b/demos/native/index.ts @@ -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'; diff --git a/demos/net/index.ts b/demos/net/index.ts index a52c227a6e..f8ddf716d3 100644 --- a/demos/net/index.ts +++ b/demos/net/index.ts @@ -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'; diff --git a/demos/profile/index.ts b/demos/profile/index.ts index 8403a4c139..f3f57d1f1e 100644 --- a/demos/profile/index.ts +++ b/demos/profile/index.ts @@ -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'; diff --git a/demos/sink/pages/search-bar.ts b/demos/sink/pages/search-bar.ts index e96434ea10..85d34da9a1 100644 --- a/demos/sink/pages/search-bar.ts +++ b/demos/sink/pages/search-bar.ts @@ -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'; diff --git a/demos/sink/pages/table-search.ts b/demos/sink/pages/table-search.ts index 025667c821..479b765112 100644 --- a/demos/sink/pages/table-search.ts +++ b/demos/sink/pages/table-search.ts @@ -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'; diff --git a/demos/sink/pages/tabs.ts b/demos/sink/pages/tabs.ts index 724fd6a99f..f36a27fd88 100644 --- a/demos/sink/pages/tabs.ts +++ b/demos/sink/pages/tabs.ts @@ -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'; diff --git a/demos/snapcat/index.ts b/demos/snapcat/index.ts index 44f966b9af..7c641a1b93 100644 --- a/demos/snapcat/index.ts +++ b/demos/snapcat/index.ts @@ -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'; diff --git a/demos/storage/index.ts b/demos/storage/index.ts index 76c530aa1b..a2f7724a94 100644 --- a/demos/storage/index.ts +++ b/demos/storage/index.ts @@ -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'; diff --git a/demos/weather/index.ts b/demos/weather/index.ts index 68943b4915..4dc3de854d 100755 --- a/demos/weather/index.ts +++ b/demos/weather/index.ts @@ -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: ` Settings diff --git a/ionic/components/checkbox/test/basic/index.ts b/ionic/components/checkbox/test/basic/index.ts index 5520a65cfc..066f8190f2 100644 --- a/ionic/components/checkbox/test/basic/index.ts +++ b/ionic/components/checkbox/test/basic/index.ts @@ -9,7 +9,7 @@ import { NgControlName, NgFormModel, FormBuilder -} from 'angular2/forms'; +} from 'angular2/angular2'; @App({ templateUrl: 'main.html' diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts index f86a1bf59f..33f6119a0d 100644 --- a/ionic/components/nav/nav-controller.ts +++ b/ionic/components/nav/nav-controller.ts @@ -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'; diff --git a/ionic/components/nav/nav.ts b/ionic/components/nav/nav.ts index a2c27e7224..0818bc2977 100644 --- a/ionic/components/nav/nav.ts +++ b/ionic/components/nav/nav.ts @@ -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'; diff --git a/ionic/components/overlay/overlay.ts b/ionic/components/overlay/overlay.ts index e6bf9ff0a6..d0da4cfe40 100644 --- a/ionic/components/overlay/overlay.ts +++ b/ionic/components/overlay/overlay.ts @@ -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'; diff --git a/ionic/components/radio/test/basic/index.ts b/ionic/components/radio/test/basic/index.ts index a54986bc90..443c358936 100644 --- a/ionic/components/radio/test/basic/index.ts +++ b/ionic/components/radio/test/basic/index.ts @@ -9,7 +9,7 @@ import { NgControlName, NgFormModel, FormBuilder -} from 'angular2/forms'; +} from 'angular2/angular2'; @App({ diff --git a/ionic/components/search-bar/search-bar.ts b/ionic/components/search-bar/search-bar.ts index e137b0dc7b..e2d1facb81 100644 --- a/ionic/components/search-bar/search-bar.ts +++ b/ionic/components/search-bar/search-bar.ts @@ -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'; diff --git a/ionic/components/search-bar/test/basic/index.ts b/ionic/components/search-bar/test/basic/index.ts index ca45be710a..41f4452aad 100644 --- a/ionic/components/search-bar/test/basic/index.ts +++ b/ionic/components/search-bar/test/basic/index.ts @@ -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'; diff --git a/ionic/components/segment/segment.ts b/ionic/components/segment/segment.ts index 65d9e3b5cb..64f19d16a9 100644 --- a/ionic/components/segment/segment.ts +++ b/ionic/components/segment/segment.ts @@ -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'; diff --git a/ionic/components/segment/test/basic/index.ts b/ionic/components/segment/test/basic/index.ts index 1e2118d449..af8c48ec61 100644 --- a/ionic/components/segment/test/basic/index.ts +++ b/ionic/components/segment/test/basic/index.ts @@ -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'; diff --git a/ionic/components/show-hide-when/test/basic/index.ts b/ionic/components/show-hide-when/test/basic/index.ts index 5520a65cfc..066f8190f2 100644 --- a/ionic/components/show-hide-when/test/basic/index.ts +++ b/ionic/components/show-hide-when/test/basic/index.ts @@ -9,7 +9,7 @@ import { NgControlName, NgFormModel, FormBuilder -} from 'angular2/forms'; +} from 'angular2/angular2'; @App({ templateUrl: 'main.html' diff --git a/ionic/components/switch/test/basic/index.ts b/ionic/components/switch/test/basic/index.ts index 5520a65cfc..066f8190f2 100644 --- a/ionic/components/switch/test/basic/index.ts +++ b/ionic/components/switch/test/basic/index.ts @@ -9,7 +9,7 @@ import { NgControlName, NgFormModel, FormBuilder -} from 'angular2/forms'; +} from 'angular2/angular2'; @App({ templateUrl: 'main.html' diff --git a/ionic/components/tabs/tab.ts b/ionic/components/tabs/tab.ts index 24afe6c9a9..920cebb005 100644 --- a/ionic/components/tabs/tab.ts +++ b/ionic/components/tabs/tab.ts @@ -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'; diff --git a/ionic/components/tabs/tabs.ts b/ionic/components/tabs/tabs.ts index 40fd909b4d..6089652454 100644 --- a/ionic/components/tabs/tabs.ts +++ b/ionic/components/tabs/tabs.ts @@ -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'; diff --git a/ionic/platform/applinks/applinks.ts b/ionic/platform/applinks/applinks.ts index 80440cf9fc..f680323a39 100644 --- a/ionic/platform/applinks/applinks.ts +++ b/ionic/platform/applinks/applinks.ts @@ -1,6 +1,3 @@ -import * as Rx from 'rx'; - -import * as util from 'ionic/util'; import {NativePlugin} from '../plugin'; /** diff --git a/ionic/platform/barcode/barcode.ts b/ionic/platform/barcode/barcode.ts index e628af95aa..016f56ec53 100644 --- a/ionic/platform/barcode/barcode.ts +++ b/ionic/platform/barcode/barcode.ts @@ -1,6 +1,3 @@ -import * as Rx from 'rx'; - -import * as util from 'ionic/util'; import {NativePlugin} from '../plugin'; /** diff --git a/ionic/platform/camera-roll/camera-roll.ts b/ionic/platform/camera-roll/camera-roll.ts index 2f4f1b614d..9ae229ff8a 100644 --- a/ionic/platform/camera-roll/camera-roll.ts +++ b/ionic/platform/camera-roll/camera-roll.ts @@ -1,6 +1,3 @@ -import * as Rx from 'rx'; - -import * as util from 'ionic/util'; import {NativePlugin} from '../plugin'; /** diff --git a/ionic/platform/contacts/contacts.ts b/ionic/platform/contacts/contacts.ts index 4e462d0cce..5fb96a35da 100644 --- a/ionic/platform/contacts/contacts.ts +++ b/ionic/platform/contacts/contacts.ts @@ -1,6 +1,3 @@ -import * as Rx from 'rx'; - -import * as util from 'ionic/util'; import {NativePlugin} from '../plugin'; /** diff --git a/ionic/platform/device-motion/device-motion.ts b/ionic/platform/device-motion/device-motion.ts index 81ae548405..419710c345 100644 --- a/ionic/platform/device-motion/device-motion.ts +++ b/ionic/platform/device-motion/device-motion.ts @@ -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'; diff --git a/ionic/platform/device-orientation/device-orientation.ts b/ionic/platform/device-orientation/device-orientation.ts index f87796a5e1..61338babea 100644 --- a/ionic/platform/device-orientation/device-orientation.ts +++ b/ionic/platform/device-orientation/device-orientation.ts @@ -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'; diff --git a/ionic/platform/device/device.ts b/ionic/platform/device/device.ts index d029148d0f..60cba9a0e0 100644 --- a/ionic/platform/device/device.ts +++ b/ionic/platform/device/device.ts @@ -1,6 +1,3 @@ -import * as Rx from 'rx'; - -import * as util from 'ionic/util'; import {NativePlugin} from '../plugin'; diff --git a/ionic/platform/dialogs/dialogs.ts b/ionic/platform/dialogs/dialogs.ts index 6083ef417a..956d6bbb30 100644 --- a/ionic/platform/dialogs/dialogs.ts +++ b/ionic/platform/dialogs/dialogs.ts @@ -1,6 +1,3 @@ -import * as Rx from 'rx'; - -import * as util from 'ionic/util'; import {NativePlugin} from '../plugin'; /** diff --git a/ionic/platform/geolocation/geolocation.ts b/ionic/platform/geolocation/geolocation.ts index a768b0f077..fb9150aec2 100644 --- a/ionic/platform/geolocation/geolocation.ts +++ b/ionic/platform/geolocation/geolocation.ts @@ -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'; /** diff --git a/ionic/platform/keyboard/keyboard.ts b/ionic/platform/keyboard/keyboard.ts index 2fba4e6d54..3f8f11cfe2 100644 --- a/ionic/platform/keyboard/keyboard.ts +++ b/ionic/platform/keyboard/keyboard.ts @@ -1,6 +1,3 @@ -import * as Rx from 'rx'; - -import * as util from 'ionic/util'; import {NativePlugin} from '../plugin'; /** diff --git a/ionic/platform/loading/loading.ts b/ionic/platform/loading/loading.ts index 113d533778..60dc20baaa 100644 --- a/ionic/platform/loading/loading.ts +++ b/ionic/platform/loading/loading.ts @@ -1,6 +1,3 @@ -import * as Rx from 'rx'; - -import * as util from 'ionic/util'; import {NativePlugin} from '../plugin'; /** diff --git a/ionic/platform/network/network.ts b/ionic/platform/network/network.ts index be76052d9c..248a358f82 100644 --- a/ionic/platform/network/network.ts +++ b/ionic/platform/network/network.ts @@ -1,6 +1,3 @@ -import * as Rx from 'rx'; - -import * as util from 'ionic/util'; import {NativePlugin} from '../plugin'; /** diff --git a/ionic/platform/statusbar/statusbar.ts b/ionic/platform/statusbar/statusbar.ts index 8027470036..5e676d5a92 100644 --- a/ionic/platform/statusbar/statusbar.ts +++ b/ionic/platform/statusbar/statusbar.ts @@ -1,6 +1,3 @@ -import * as Rx from 'rx'; - -import * as util from 'ionic/util'; import {NativePlugin} from '../plugin'; /** diff --git a/ionic/platform/vibration/vibration.ts b/ionic/platform/vibration/vibration.ts index 2e314d5949..ca72767ccb 100644 --- a/ionic/platform/vibration/vibration.ts +++ b/ionic/platform/vibration/vibration.ts @@ -1,6 +1,3 @@ -import * as Rx from 'rx'; - -import * as util from 'ionic/util'; import {NativePlugin} from '../plugin'; /** diff --git a/package.json b/package.json index e75ae0c89a..7452a3b1c9 100644 --- a/package.json +++ b/package.json @@ -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",