Merge remote-tracking branch 'upstream/2.0' into 2.0

ionic/animations/animation.ts

@@ -257,7 +257,7 @@ export class Animation {
     for (i = 0; i < self._pFns.length; i++) {
       self._pFns[i]();
     }
-    this.isPlaying = true;
+    self.isPlaying = true;
 
     // this is the top level animation and is in full control
     // of when the async play() should actually kick off
@@ -271,7 +271,7 @@ export class Animation {
     self._before();
 
     // ensure all past transition end events have been cleared
-    this._clearAsync();
+    self._clearAsync();
 
     if (duration > 30) {
       // this animation has a duration, so it should animate
@@ -280,7 +280,7 @@ export class Animation {
       // set the FROM properties
       self._progress(0);
 
-      self._willChange(true);
+      self._willChg(true);
 
       // set the async TRANSITION END event
       // and run onFinishes when the transition ends
@@ -364,7 +364,7 @@ export class Animation {
 
       // set the after styles
       self._after();
-      self._willChange(false);
+      self._willChg(false);
       self._onFinish(shouldComplete);
     }
 
@@ -372,12 +372,20 @@ export class Animation {
     self._unregTrans = transitionEnd(self._transEl(), onTransitionEnd);
 
     // set a fallback timeout if the transition end event never fires
-    self._tmr = setTimeout(onTransitionEnd, duration + 300);
+    self._tmr = setTimeout(function() {
+      // oh noz! the transition end event didn't fire in time!
+      // instead the fallback timer when first
+      // ensure the ending progress step gets rendered
+      self._progress(1);
+
+      // manually run transition end event
+      onTransitionEnd(null);
+    }, duration + 350);
   }
 
   _clearAsync() {
+    this._unregTrans && this._unregTrans();
     if (this._tmr) {
-      this._unregTrans && this._unregTrans();
       clearTimeout(this._tmr);
       this._tmr = 0;
     }
@@ -483,13 +491,13 @@ export class Animation {
     }
   }
 
-  _willChange(addWillChange: boolean) {
+  _willChg(addWillChange: boolean) {
     var i: number;
     var wc: string[];
     var prop: string;
 
     for (i = 0; i < this._c.length; i++) {
-      this._c[i]._willChange(addWillChange);
+      this._c[i]._willChg(addWillChange);
     }
 
     if (this._wChg) {
@@ -652,7 +660,7 @@ export class Animation {
       // the progress was already left off at the point that is finished
       // for example, the left menu was dragged all the way open already
       this._after();
-      this._willChange(false);
+      this._willChg(false);
       this._onFinish(shouldComplete);
 
     } else {

ionic/components/action-sheet/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, ActionSheet, NavController} from '../../../../../ionic/ionic';
+import {App, Page, ActionSheet, NavController} from 'ionic-angular';
 
 
 @Page({

ionic/components/alert/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, Alert, Modal, NavController, ViewController} from '../../../../../ionic/ionic';
+import {App, Page, Alert, Modal, NavController, ViewController} from 'ionic-angular';
 
 
 @Page({

ionic/components/app/test/animations/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, Animation, IonicApp} from '../../../../../ionic/ionic';
+import {App, Page, Animation, IonicApp} from 'ionic-angular';
 
 
 @Page({

ionic/components/app/test/storage/index.ts

@@ -1,7 +1,7 @@
 import {Component} from 'angular2/core';
 import {Control, ControlGroup} from 'angular2/common';
 
-import {App, Storage, LocalStorage, SqlStorage} from '../../../../../ionic/ionic';
+import {App, Storage, LocalStorage, SqlStorage} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

ionic/components/app/test/typography/index.ts

@@ -1,4 +1,4 @@
-import {App, IonicApp} from '../../../../../ionic/ionic';
+import {App, IonicApp} from 'ionic-angular';
 
 
 @App({

ionic/components/badge/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {App, IonicApp} from '../../../../../ionic/ionic';
+import {App, IonicApp} from 'ionic-angular';
 
 
 @App({

ionic/components/blur/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/button/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {App, IonicApp} from '../../../../../ionic/ionic';
+import {App, IonicApp} from 'ionic-angular';
 
 
 @App({

ionic/components/button/test/block/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/button/test/button.spec.ts

@@ -1,4 +1,4 @@
-import {Button, Config} from '../../../../ionic/ionic';
+import {Button, Config} from 'ionic-angular';
 
 export function run() {
 

ionic/components/button/test/clear/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/button/test/fab/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/button/test/full/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/button/test/icons/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/button/test/outline/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/button/test/round/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/button/test/sizes/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/card/test/advanced/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/card/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/card/test/images/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/card/test/list/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/card/test/map/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/card/test/social/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/checkbox/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 import {
   Control,
   ControlGroup,

ionic/components/chip/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {App, IonicApp} from '../../../../../ionic/ionic';
+import {App, IonicApp} from 'ionic-angular';
 
 
 @App({

ionic/components/chip/test/delete/index.ts

@@ -1,4 +1,4 @@
-import {App, IonicApp} from '../../../../../ionic/ionic';
+import {App, IonicApp} from 'ionic-angular';
 
 
 @App({

ionic/components/chip/test/icon/index.ts

@@ -1,4 +1,4 @@
-import {App, IonicApp} from '../../../../../ionic/ionic';
+import {App, IonicApp} from 'ionic-angular';
 
 
 @App({

ionic/components/chip/test/image/index.ts

@@ -1,4 +1,4 @@
-import {App, IonicApp} from '../../../../../ionic/ionic';
+import {App, IonicApp} from 'ionic-angular';
 
 
 @App({

ionic/components/grid/test/alignment/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/grid/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/grid/test/full/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/icon/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/input/test/fixed-inline-labels/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/input/test/floating-labels/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/input/test/form-inputs/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 import {FormBuilder, Validators} from 'angular2/common';
 
 

ionic/components/input/test/inline-labels/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/input/test/input-focus/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/input/test/inset-inputs/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/input/test/placeholder-labels/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/input/test/stacked-labels/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/input/test/text-input.spec.ts

@@ -1,4 +1,4 @@
-import {TextInput} from '../../../../ionic/ionic';
+import {TextInput} from 'ionic-angular';
 
 export function run() {
 

ionic/components/item/test/buttons/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/item/test/dividers/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/item/test/groups/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, NavController, NavParams} from '../../../../../ionic/ionic';
+import {App, Page, NavController, NavParams} from 'ionic-angular';
 
 
 @Page({

ionic/components/item/test/icons/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/item/test/images/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/item/test/media/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/item/test/sliding/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, IonicApp, Alert, NavController} from '../../../../../ionic/ionic';
+import {App, Page, IonicApp, Alert, NavController} from 'ionic-angular';
 
 
 @Page({

ionic/components/item/test/text/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/list/test/headers/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/list/test/infinite/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/list/test/inset/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/list/test/no-lines/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/list/test/repeat-headers/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/list/test/sticky/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/menu/menu-controller.ts

@@ -46,7 +46,7 @@ import {MenuType} from './menu-types';
  * without requiring a menu ID.
  *
  * ```ts
- * import{Page, MenuController} from 'ionic/ionic';
+ * import{Page, MenuController} from 'ionic-angular';
  * @Page({...})
  * export class MyPage {
  *  constructor(menu: MenuController) {

ionic/components/menu/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {App, IonicApp, MenuController, Page, NavController, Alert} from '../../../../../ionic/ionic';
+import {App, IonicApp, MenuController, Page, NavController, Alert} from 'ionic-angular';
 
 
 @Page({

ionic/components/menu/test/disable-swipe/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, NavController, MenuController} from '../../../../../ionic/ionic';
+import {App, Page, NavController, MenuController} from 'ionic-angular';
 
 @Page({
   templateUrl: 'page1.html'

ionic/components/menu/test/enable-disable/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, IonicApp, MenuController} from '../../../../../ionic/ionic';
+import {App, Page, IonicApp, MenuController} from 'ionic-angular';
 
 
 @Page({

ionic/components/menu/test/menu.spec.ts

@@ -1,4 +1,4 @@
-import {MenuController, Menu} from '../../../../ionic/ionic';
+import {MenuController, Menu} from 'ionic-angular';
 
 export function run() {
   describe('MenuController', () => {

ionic/components/menu/test/multiple/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, MenuController} from '../../../../../ionic/ionic';
+import {App, Page, MenuController} from 'ionic-angular';
 
 
 @Page({

ionic/components/menu/test/overlay/index.ts

@@ -1,4 +1,4 @@
-import {App, IonicApp, Page} from '../../../../../ionic/ionic';
+import {App, IonicApp, Page} from 'ionic-angular';
 
 
 @Page({templateUrl: 'page1.html'})

ionic/components/menu/test/push/index.ts

@@ -1,4 +1,4 @@
-import {App, IonicApp, Page} from '../../../../../ionic/ionic';
+import {App, IonicApp, Page} from 'ionic-angular';
 
 
 @Page({templateUrl: 'page1.html'})

ionic/components/menu/test/reveal/index.ts

@@ -1,4 +1,4 @@
-import {App, IonicApp, Page} from '../../../../../ionic/ionic';
+import {App, IonicApp, Page} from 'ionic-angular';
 
 
 @Page({templateUrl: 'page1.html'})

ionic/components/modal/modal.ts

@@ -28,7 +28,7 @@ import {Transition, TransitionOptions} from '../../transitions/transition';
  *
  * @usage
  * ```ts
- * import {Page, Modal, NavController, NavParams} from 'ionic/ionic';
+ * import {Page, Modal, NavController, NavParams} from 'ionic-angular';
  *
  * @Page(...)
  * class HomePage {
@@ -60,7 +60,7 @@ import {Transition, TransitionOptions} from '../../transitions/transition';
  * modal.
  *
  * ```ts
- * import {Page, Modal, NavController} from 'ionic/ionic';
+ * import {Page, Modal, NavController} from 'ionic-angular';
  *
  * @Page(...)
  * class HomePage {

ionic/components/modal/test/basic/index.ts

@@ -1,5 +1,5 @@
-import {App, Page, Config, Platform} from '../../../../../ionic/ionic';
-import {Modal, ActionSheet, NavController, NavParams, Transition, TransitionOptions, ViewController} from '../../../../../ionic/ionic';;
+import {App, Page, Config, Platform} from 'ionic-angular';
+import {Modal, ActionSheet, NavController, NavParams, Transition, TransitionOptions, ViewController} from 'ionic-angular';;
 
 
 @Page({

ionic/components/nav/nav-controller.ts

@@ -187,7 +187,7 @@ export class NavController extends Ion {
    *
    *
    *```typescript
-   * import {Page, NavController} from 'ionic/ionic'
+   * import {Page, NavController} from 'ionic-angular'
    * import {Detail} from '../detail/detail'
    * import {Info} from '../info/info'
    *
@@ -208,7 +208,7 @@ export class NavController extends Ion {
    *
    *
    *```typescript
-   * import {Page, NavController} from 'ionic/ionic'
+   * import {Page, NavController} from 'ionic-angular'
    * import {Detail} from '../detail/detail'
    *
    *  export class Home {
@@ -228,7 +228,7 @@ export class NavController extends Ion {
    *
    *
    *```typescript
-   * import {Page, NavController} from 'ionic/ionic';
+   * import {Page, NavController} from 'ionic-angular';
    * import {Info} from '../info/info';
    * import {List} from '../list/list';
    * import {Detail} from '../detail/detail';

ionic/components/nav/test/basic/index.ts

@@ -1,7 +1,7 @@
 import {Component, Type} from 'angular2/core';
-import {App, NavController, Alert} from '../../../../../ionic/ionic';
-import {Page, Config, IonicApp} from '../../../../../ionic/ionic';
-import {NavParams, ViewController, IONIC_DIRECTIVES} from '../../../../../ionic/ionic';;
+import {App, NavController, Alert} from 'ionic-angular';
+import {Page, Config, IonicApp} from 'ionic-angular';
+import {NavParams, ViewController, IONIC_DIRECTIVES} from 'ionic-angular';;
 
 
 @Component({

ionic/components/nav/test/insert-views/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, NavController} from '../../../../../ionic/ionic';
+import {App, Page, NavController} from 'ionic-angular';
 
 
 

ionic/components/nav/test/memory/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, NavController} from '../../../../../ionic/ionic';
+import {App, Page, NavController} from 'ionic-angular';
 
 
 let delay = 100;

ionic/components/nav/test/nav-controller.spec.ts

@@ -1,4 +1,4 @@
-import {NavController, Tabs, NavOptions, Config, ViewController} from '../../../../ionic/ionic';
+import {NavController, Tabs, NavOptions, Config, ViewController} from 'ionic-angular';
 
 export function run() {
   describe('NavController', () => {

ionic/components/nav/test/nested/index.ts

@@ -1,5 +1,5 @@
-import {App, NavParams, NavController, ViewController, MenuController} from '../../../../../ionic/ionic';
-import {Page, Config, IonicApp} from '../../../../../ionic/ionic';
+import {App, NavParams, NavController, ViewController, MenuController} from 'ionic-angular';
+import {Page, Config, IonicApp} from 'ionic-angular';
 
 
 @Page({

ionic/components/nav/test/routing/index.ts

@@ -1,6 +1,6 @@
 import {RouteConfig, Location} from 'angular2/router';
 
-import {App, Page, NavParams, ViewController} from '../../../../../ionic/ionic';
+import {App, Page, NavParams, ViewController} from 'ionic-angular';
 
 
 @Page({templateUrl: 'view1.html'})

ionic/components/nav/view-controller.ts

@@ -11,7 +11,7 @@ import {NavParams} from './nav-params';
  * Access various features and information about the current view
  * @usage
  *  ```ts
- *  import {Page, ViewController} from 'ionic/ionic';
+ *  import {Page, ViewController} from 'ionic-angular';
  *  @Page....
  *  export class MyPage{
  *   constructor(viewCtrl: ViewController){

ionic/components/radio/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 import {Control, ControlGroup} from 'angular2/common';
 
 

ionic/components/scroll/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/scroll/test/pull-to-refresh/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/searchbar/test/floating/index.ts

@@ -1,6 +1,6 @@
 import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common';
 
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html',

ionic/components/searchbar/test/nav/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, NavController} from '../../../../../ionic/ionic';
+import {App, Page, NavController} from 'ionic-angular';
 
 @Page({
   templateUrl: 'first.html'

ionic/components/searchbar/test/toolbar/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

ionic/components/segment/test/basic/index.ts

@@ -1,6 +1,6 @@
 import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common';
 
-import {App, IonicApp} from '../../../../../ionic/ionic';
+import {App, IonicApp} from 'ionic-angular';
 
 
 @App({

ionic/components/segment/test/nav/index.ts

@@ -1,5 +1,5 @@
 import {Validators, Control, ControlGroup} from 'angular2/common';
-import {App, Page, NavController} from '../../../../../ionic/ionic';
+import {App, Page, NavController} from 'ionic-angular';
 
 
 @Page({

ionic/components/segment/test/swipe/index.ts

@@ -1,6 +1,6 @@
 import {Validators, Control, ControlGroup} from 'angular2/common';
 import {Http} from 'angular2/http';
-import {App, Page, IonicApp, NavController} from '../../../../../ionic/ionic';
+import {App, Page, IonicApp, NavController} from 'ionic-angular';
 
 
 @Page({

ionic/components/select/test/multiple-value/index.ts

@@ -1,4 +1,4 @@
-import {App, Page} from '../../../../../ionic/ionic';
+import {App, Page} from 'ionic-angular';
 
 
 @Page({

ionic/components/select/test/single-value/index.ts

@@ -1,6 +1,6 @@
 import {NgFor} from 'angular2/common';
 
-import {App, Page} from '../../../../../ionic/ionic';
+import {App, Page} from 'ionic-angular';
 
 
 @Page({

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

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 import {
   Control,
   ControlGroup,

ionic/components/slides/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {App, IonicApp} from '../../../../../ionic/ionic';
+import {App, IonicApp} from 'ionic-angular';
 import {Http} from 'angular2/http';
 
 @App({

ionic/components/slides/test/intro/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, NavController} from 'ionic/ionic';
+import {App, Page, NavController} from 'ionic-angular';
 
 
 @App({

ionic/components/slides/test/loop/index.ts

@@ -1,4 +1,4 @@
-import {App, IonicApp} from '../../../../../ionic/ionic';
+import {App, IonicApp} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

ionic/components/slides/test/scroll/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html',

ionic/components/tabs/test/advanced/index.ts

@@ -1,7 +1,7 @@
 import {ViewChild} from 'angular2/core';
 import {RouteConfig, Location} from 'angular2/router';
 
-import {App, Page, NavController, NavParams, Modal, ViewController, Tabs} from '../../../../../ionic/ionic';
+import {App, Page, NavController, NavParams, Modal, ViewController, Tabs} from 'ionic-angular';
 
 
 @Page({

ionic/components/tabs/test/badges/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/tabs/test/basic/index.ts

@@ -1,4 +1,4 @@
-  import {App, Page, NavController, Alert, Modal, ViewController} from '../../../../../ionic/ionic';
+  import {App, Page, NavController, Alert, Modal, ViewController} from 'ionic-angular';
 
 //
 // Modal

ionic/components/tabs/test/ghost/index.ts

@@ -1,4 +1,4 @@
-  import {App, Page, NavController, Tab} from '../../../../../ionic/ionic';
+  import {App, Page, NavController, Tab} from 'ionic-angular';
 
 import {ContentChild, QueryList, ViewChildren} from 'angular2/core';
 

ionic/components/tabs/test/tab-bar-scenarios/index.ts

@@ -1,4 +1,4 @@
-import {App, Page} from '../../../../../ionic/ionic';
+import {App, Page} from 'ionic-angular';
 
 
 @Page({template:'hi'})

ionic/components/tap-click/test/tapClick.spec.ts

@@ -1,4 +1,4 @@
-import * as tapClick from '../../../../ionic/ionic';
+import * as tapClick from 'ionic-angular';
 
 export function run() {
 

ionic/components/toggle/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 import {
   Control,
   ControlGroup,

ionic/components/toolbar/test/colors/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({

ionic/components/toolbar/test/scenarios/index.ts

@@ -1,4 +1,4 @@
-import {App} from '../../../../../ionic/ionic';
+import {App} from 'ionic-angular';
 
 
 @App({