From c883a2ae9164b56c316358adbd998d631bf1ac68 Mon Sep 17 00:00:00 2001 From: Tim Lancina Date: Mon, 22 Feb 2016 17:45:17 -0600 Subject: [PATCH] chore(): update Ionic imports in tests --- ionic/components/action-sheet/test/basic/index.ts | 2 +- ionic/components/alert/test/basic/index.ts | 2 +- ionic/components/app/test/animations/index.ts | 2 +- ionic/components/app/test/storage/index.ts | 2 +- ionic/components/app/test/typography/index.ts | 2 +- ionic/components/badge/test/basic/index.ts | 2 +- ionic/components/blur/test/basic/index.ts | 2 +- ionic/components/button/test/basic/index.ts | 2 +- ionic/components/button/test/block/index.ts | 2 +- ionic/components/button/test/button.spec.ts | 2 +- ionic/components/button/test/clear/index.ts | 2 +- ionic/components/button/test/fab/index.ts | 2 +- ionic/components/button/test/full/index.ts | 2 +- ionic/components/button/test/icons/index.ts | 2 +- ionic/components/button/test/outline/index.ts | 2 +- ionic/components/button/test/round/index.ts | 2 +- ionic/components/button/test/sizes/index.ts | 2 +- ionic/components/card/test/advanced/index.ts | 2 +- ionic/components/card/test/basic/index.ts | 2 +- ionic/components/card/test/images/index.ts | 2 +- ionic/components/card/test/list/index.ts | 2 +- ionic/components/card/test/map/index.ts | 2 +- ionic/components/card/test/social/index.ts | 2 +- ionic/components/checkbox/test/basic/index.ts | 2 +- ionic/components/chip/test/basic/index.ts | 2 +- ionic/components/chip/test/delete/index.ts | 2 +- ionic/components/chip/test/icon/index.ts | 2 +- ionic/components/chip/test/image/index.ts | 2 +- ionic/components/grid/test/alignment/index.ts | 2 +- ionic/components/grid/test/basic/index.ts | 2 +- ionic/components/grid/test/full/index.ts | 2 +- ionic/components/icon/test/basic/index.ts | 2 +- .../components/input/test/fixed-inline-labels/index.ts | 2 +- ionic/components/input/test/floating-labels/index.ts | 2 +- ionic/components/input/test/form-inputs/index.ts | 2 +- ionic/components/input/test/inline-labels/index.ts | 2 +- ionic/components/input/test/input-focus/index.ts | 2 +- ionic/components/input/test/inset-inputs/index.ts | 2 +- .../components/input/test/placeholder-labels/index.ts | 2 +- ionic/components/input/test/stacked-labels/index.ts | 2 +- ionic/components/input/test/text-input.spec.ts | 2 +- ionic/components/item/test/buttons/index.ts | 2 +- ionic/components/item/test/dividers/index.ts | 2 +- ionic/components/item/test/groups/index.ts | 2 +- ionic/components/item/test/icons/index.ts | 2 +- ionic/components/item/test/images/index.ts | 2 +- ionic/components/item/test/media/index.ts | 2 +- ionic/components/item/test/sliding/index.ts | 2 +- ionic/components/item/test/text/index.ts | 2 +- ionic/components/list/test/headers/index.ts | 2 +- ionic/components/list/test/infinite/index.ts | 2 +- ionic/components/list/test/inset/index.ts | 2 +- ionic/components/list/test/no-lines/index.ts | 2 +- ionic/components/list/test/repeat-headers/index.ts | 2 +- ionic/components/list/test/sticky/index.ts | 2 +- ionic/components/menu/menu-controller.ts | 2 +- ionic/components/menu/test/basic/index.ts | 2 +- ionic/components/menu/test/disable-swipe/index.ts | 2 +- ionic/components/menu/test/enable-disable/index.ts | 2 +- ionic/components/menu/test/menu.spec.ts | 2 +- ionic/components/menu/test/multiple/index.ts | 2 +- ionic/components/menu/test/overlay/index.ts | 2 +- ionic/components/menu/test/push/index.ts | 2 +- ionic/components/menu/test/reveal/index.ts | 2 +- ionic/components/modal/modal.ts | 4 ++-- ionic/components/modal/test/basic/index.ts | 4 ++-- ionic/components/nav/nav-controller.ts | 6 +++--- ionic/components/nav/test/basic/index.ts | 6 +++--- ionic/components/nav/test/insert-views/index.ts | 2 +- ionic/components/nav/test/memory/index.ts | 2 +- ionic/components/nav/test/nav-controller.spec.ts | 2 +- ionic/components/nav/test/nested/index.ts | 4 ++-- ionic/components/nav/test/routing/index.ts | 2 +- ionic/components/nav/view-controller.ts | 2 +- ionic/components/radio/test/basic/index.ts | 2 +- ionic/components/scroll/test/basic/index.ts | 2 +- ionic/components/scroll/test/pull-to-refresh/index.ts | 2 +- ionic/components/searchbar/test/floating/index.ts | 2 +- ionic/components/searchbar/test/nav/index.ts | 2 +- ionic/components/searchbar/test/toolbar/index.ts | 2 +- ionic/components/segment/test/basic/index.ts | 2 +- ionic/components/segment/test/nav/index.ts | 2 +- ionic/components/segment/test/swipe/index.ts | 2 +- ionic/components/select/test/multiple-value/index.ts | 2 +- ionic/components/select/test/single-value/index.ts | 2 +- ionic/components/show-hide-when/test/basic/index.ts | 2 +- ionic/components/slides/test/basic/index.ts | 2 +- ionic/components/slides/test/intro/index.ts | 2 +- ionic/components/slides/test/loop/index.ts | 2 +- ionic/components/slides/test/scroll/index.ts | 2 +- ionic/components/tabs/test/advanced/index.ts | 2 +- ionic/components/tabs/test/badges/index.ts | 2 +- ionic/components/tabs/test/basic/index.ts | 2 +- ionic/components/tabs/test/ghost/index.ts | 2 +- ionic/components/tabs/test/tab-bar-scenarios/index.ts | 2 +- ionic/components/tap-click/test/tapClick.spec.ts | 2 +- ionic/components/toggle/test/basic/index.ts | 2 +- ionic/components/toolbar/test/colors/index.ts | 2 +- ionic/components/toolbar/test/scenarios/index.ts | 2 +- ionic/config/test/config.spec.ts | 2 +- ionic/decorators/app.ts | 2 +- ionic/decorators/page.ts | 4 ++-- ionic/platform/platform.ts | 10 +++++----- ionic/platform/storage/local-storage.ts | 2 +- ionic/platform/test/platform.spec.ts | 2 +- scripts/demos/index.template.dev.html | 8 ++++++-- scripts/e2e/e2e.template.html | 8 ++++++-- 107 files changed, 129 insertions(+), 121 deletions(-) diff --git a/ionic/components/action-sheet/test/basic/index.ts b/ionic/components/action-sheet/test/basic/index.ts index 134d6258f1..5a745a3bc4 100644 --- a/ionic/components/action-sheet/test/basic/index.ts +++ b/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({ diff --git a/ionic/components/alert/test/basic/index.ts b/ionic/components/alert/test/basic/index.ts index 2902c5b2f5..048060c420 100644 --- a/ionic/components/alert/test/basic/index.ts +++ b/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({ diff --git a/ionic/components/app/test/animations/index.ts b/ionic/components/app/test/animations/index.ts index d0ce9de8a8..3fbee9fde5 100644 --- a/ionic/components/app/test/animations/index.ts +++ b/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({ diff --git a/ionic/components/app/test/storage/index.ts b/ionic/components/app/test/storage/index.ts index ad60d39f86..527b8c0dd9 100644 --- a/ionic/components/app/test/storage/index.ts +++ b/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' diff --git a/ionic/components/app/test/typography/index.ts b/ionic/components/app/test/typography/index.ts index c77689fd38..3ed6642c7e 100644 --- a/ionic/components/app/test/typography/index.ts +++ b/ionic/components/app/test/typography/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from '../../../../../ionic/ionic'; +import {App, IonicApp} from 'ionic-angular'; @App({ diff --git a/ionic/components/badge/test/basic/index.ts b/ionic/components/badge/test/basic/index.ts index b4a0c315f8..3d097baac0 100644 --- a/ionic/components/badge/test/basic/index.ts +++ b/ionic/components/badge/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from '../../../../../ionic/ionic'; +import {App, IonicApp} from 'ionic-angular'; @App({ diff --git a/ionic/components/blur/test/basic/index.ts b/ionic/components/blur/test/basic/index.ts index bc32179fee..53fad6e85a 100644 --- a/ionic/components/blur/test/basic/index.ts +++ b/ionic/components/blur/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/button/test/basic/index.ts b/ionic/components/button/test/basic/index.ts index 0619a93f8d..08bc65ea84 100644 --- a/ionic/components/button/test/basic/index.ts +++ b/ionic/components/button/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from '../../../../../ionic/ionic'; +import {App, IonicApp} from 'ionic-angular'; @App({ diff --git a/ionic/components/button/test/block/index.ts b/ionic/components/button/test/block/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/button/test/block/index.ts +++ b/ionic/components/button/test/block/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/button/test/button.spec.ts b/ionic/components/button/test/button.spec.ts index 2a84e7f6cb..4f1ba8c3d0 100644 --- a/ionic/components/button/test/button.spec.ts +++ b/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() { diff --git a/ionic/components/button/test/clear/index.ts b/ionic/components/button/test/clear/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/button/test/clear/index.ts +++ b/ionic/components/button/test/clear/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/button/test/fab/index.ts b/ionic/components/button/test/fab/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/button/test/fab/index.ts +++ b/ionic/components/button/test/fab/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/button/test/full/index.ts b/ionic/components/button/test/full/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/button/test/full/index.ts +++ b/ionic/components/button/test/full/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/button/test/icons/index.ts b/ionic/components/button/test/icons/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/button/test/icons/index.ts +++ b/ionic/components/button/test/icons/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/button/test/outline/index.ts b/ionic/components/button/test/outline/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/button/test/outline/index.ts +++ b/ionic/components/button/test/outline/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/button/test/round/index.ts b/ionic/components/button/test/round/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/button/test/round/index.ts +++ b/ionic/components/button/test/round/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/button/test/sizes/index.ts b/ionic/components/button/test/sizes/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/button/test/sizes/index.ts +++ b/ionic/components/button/test/sizes/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/card/test/advanced/index.ts b/ionic/components/card/test/advanced/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/card/test/advanced/index.ts +++ b/ionic/components/card/test/advanced/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/card/test/basic/index.ts b/ionic/components/card/test/basic/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/card/test/basic/index.ts +++ b/ionic/components/card/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/card/test/images/index.ts b/ionic/components/card/test/images/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/card/test/images/index.ts +++ b/ionic/components/card/test/images/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/card/test/list/index.ts b/ionic/components/card/test/list/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/card/test/list/index.ts +++ b/ionic/components/card/test/list/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/card/test/map/index.ts b/ionic/components/card/test/map/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/card/test/map/index.ts +++ b/ionic/components/card/test/map/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/card/test/social/index.ts b/ionic/components/card/test/social/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/card/test/social/index.ts +++ b/ionic/components/card/test/social/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/checkbox/test/basic/index.ts b/ionic/components/checkbox/test/basic/index.ts index 3d068fd239..ce1f193d62 100644 --- a/ionic/components/checkbox/test/basic/index.ts +++ b/ionic/components/checkbox/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; import { Control, ControlGroup, diff --git a/ionic/components/chip/test/basic/index.ts b/ionic/components/chip/test/basic/index.ts index b4a0c315f8..3d097baac0 100644 --- a/ionic/components/chip/test/basic/index.ts +++ b/ionic/components/chip/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from '../../../../../ionic/ionic'; +import {App, IonicApp} from 'ionic-angular'; @App({ diff --git a/ionic/components/chip/test/delete/index.ts b/ionic/components/chip/test/delete/index.ts index c35cc11fbc..4bb6640242 100644 --- a/ionic/components/chip/test/delete/index.ts +++ b/ionic/components/chip/test/delete/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from '../../../../../ionic/ionic'; +import {App, IonicApp} from 'ionic-angular'; @App({ diff --git a/ionic/components/chip/test/icon/index.ts b/ionic/components/chip/test/icon/index.ts index b4a0c315f8..3d097baac0 100644 --- a/ionic/components/chip/test/icon/index.ts +++ b/ionic/components/chip/test/icon/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from '../../../../../ionic/ionic'; +import {App, IonicApp} from 'ionic-angular'; @App({ diff --git a/ionic/components/chip/test/image/index.ts b/ionic/components/chip/test/image/index.ts index b4a0c315f8..3d097baac0 100644 --- a/ionic/components/chip/test/image/index.ts +++ b/ionic/components/chip/test/image/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from '../../../../../ionic/ionic'; +import {App, IonicApp} from 'ionic-angular'; @App({ diff --git a/ionic/components/grid/test/alignment/index.ts b/ionic/components/grid/test/alignment/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/grid/test/alignment/index.ts +++ b/ionic/components/grid/test/alignment/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/grid/test/basic/index.ts b/ionic/components/grid/test/basic/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/grid/test/basic/index.ts +++ b/ionic/components/grid/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/grid/test/full/index.ts b/ionic/components/grid/test/full/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/grid/test/full/index.ts +++ b/ionic/components/grid/test/full/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/icon/test/basic/index.ts b/ionic/components/icon/test/basic/index.ts index e390fb7f11..69412e23db 100644 --- a/ionic/components/icon/test/basic/index.ts +++ b/ionic/components/icon/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/input/test/fixed-inline-labels/index.ts b/ionic/components/input/test/fixed-inline-labels/index.ts index bb337d3a10..4ed6115669 100644 --- a/ionic/components/input/test/fixed-inline-labels/index.ts +++ b/ionic/components/input/test/fixed-inline-labels/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/input/test/floating-labels/index.ts b/ionic/components/input/test/floating-labels/index.ts index 35e138caf5..2bc50335e0 100644 --- a/ionic/components/input/test/floating-labels/index.ts +++ b/ionic/components/input/test/floating-labels/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/input/test/form-inputs/index.ts b/ionic/components/input/test/form-inputs/index.ts index 1c48bec6eb..219cb492d0 100644 --- a/ionic/components/input/test/form-inputs/index.ts +++ b/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'; diff --git a/ionic/components/input/test/inline-labels/index.ts b/ionic/components/input/test/inline-labels/index.ts index 7c1848b72b..b8876dec76 100644 --- a/ionic/components/input/test/inline-labels/index.ts +++ b/ionic/components/input/test/inline-labels/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/input/test/input-focus/index.ts b/ionic/components/input/test/input-focus/index.ts index f6216ae6b9..552fec2f9c 100644 --- a/ionic/components/input/test/input-focus/index.ts +++ b/ionic/components/input/test/input-focus/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/input/test/inset-inputs/index.ts b/ionic/components/input/test/inset-inputs/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/input/test/inset-inputs/index.ts +++ b/ionic/components/input/test/inset-inputs/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/input/test/placeholder-labels/index.ts b/ionic/components/input/test/placeholder-labels/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/input/test/placeholder-labels/index.ts +++ b/ionic/components/input/test/placeholder-labels/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/input/test/stacked-labels/index.ts b/ionic/components/input/test/stacked-labels/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/input/test/stacked-labels/index.ts +++ b/ionic/components/input/test/stacked-labels/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/input/test/text-input.spec.ts b/ionic/components/input/test/text-input.spec.ts index 54418e9014..991f9585d7 100644 --- a/ionic/components/input/test/text-input.spec.ts +++ b/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() { diff --git a/ionic/components/item/test/buttons/index.ts b/ionic/components/item/test/buttons/index.ts index 1759142cf0..90ce040d2a 100644 --- a/ionic/components/item/test/buttons/index.ts +++ b/ionic/components/item/test/buttons/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/item/test/dividers/index.ts b/ionic/components/item/test/dividers/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/item/test/dividers/index.ts +++ b/ionic/components/item/test/dividers/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/item/test/groups/index.ts b/ionic/components/item/test/groups/index.ts index 40545aad83..0864f697e4 100644 --- a/ionic/components/item/test/groups/index.ts +++ b/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({ diff --git a/ionic/components/item/test/icons/index.ts b/ionic/components/item/test/icons/index.ts index 43aed36502..94309ec640 100644 --- a/ionic/components/item/test/icons/index.ts +++ b/ionic/components/item/test/icons/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/item/test/images/index.ts b/ionic/components/item/test/images/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/item/test/images/index.ts +++ b/ionic/components/item/test/images/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/item/test/media/index.ts b/ionic/components/item/test/media/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/item/test/media/index.ts +++ b/ionic/components/item/test/media/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/item/test/sliding/index.ts b/ionic/components/item/test/sliding/index.ts index 196760ef88..029fa03ba8 100644 --- a/ionic/components/item/test/sliding/index.ts +++ b/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({ diff --git a/ionic/components/item/test/text/index.ts b/ionic/components/item/test/text/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/item/test/text/index.ts +++ b/ionic/components/item/test/text/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/list/test/headers/index.ts b/ionic/components/list/test/headers/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/list/test/headers/index.ts +++ b/ionic/components/list/test/headers/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/list/test/infinite/index.ts b/ionic/components/list/test/infinite/index.ts index bbfbeb77cf..709b974f1d 100644 --- a/ionic/components/list/test/infinite/index.ts +++ b/ionic/components/list/test/infinite/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/list/test/inset/index.ts b/ionic/components/list/test/inset/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/list/test/inset/index.ts +++ b/ionic/components/list/test/inset/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/list/test/no-lines/index.ts b/ionic/components/list/test/no-lines/index.ts index 6a30176f2a..94309ec640 100644 --- a/ionic/components/list/test/no-lines/index.ts +++ b/ionic/components/list/test/no-lines/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/list/test/repeat-headers/index.ts b/ionic/components/list/test/repeat-headers/index.ts index 55b159d8ab..fe9ea70c26 100644 --- a/ionic/components/list/test/repeat-headers/index.ts +++ b/ionic/components/list/test/repeat-headers/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/list/test/sticky/index.ts b/ionic/components/list/test/sticky/index.ts index e753b62ae5..1077c3f8b6 100644 --- a/ionic/components/list/test/sticky/index.ts +++ b/ionic/components/list/test/sticky/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/menu/menu-controller.ts b/ionic/components/menu/menu-controller.ts index a51359e2e3..161ae339fc 100644 --- a/ionic/components/menu/menu-controller.ts +++ b/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) { diff --git a/ionic/components/menu/test/basic/index.ts b/ionic/components/menu/test/basic/index.ts index 3cc926fbba..e65f0ef549 100644 --- a/ionic/components/menu/test/basic/index.ts +++ b/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({ diff --git a/ionic/components/menu/test/disable-swipe/index.ts b/ionic/components/menu/test/disable-swipe/index.ts index f082752d49..5d0403a560 100644 --- a/ionic/components/menu/test/disable-swipe/index.ts +++ b/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' diff --git a/ionic/components/menu/test/enable-disable/index.ts b/ionic/components/menu/test/enable-disable/index.ts index 24255c5f2a..ad916be7e0 100644 --- a/ionic/components/menu/test/enable-disable/index.ts +++ b/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({ diff --git a/ionic/components/menu/test/menu.spec.ts b/ionic/components/menu/test/menu.spec.ts index 5d79fc94cc..adb2cff552 100644 --- a/ionic/components/menu/test/menu.spec.ts +++ b/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', () => { diff --git a/ionic/components/menu/test/multiple/index.ts b/ionic/components/menu/test/multiple/index.ts index eaab81dc85..68da68460d 100644 --- a/ionic/components/menu/test/multiple/index.ts +++ b/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({ diff --git a/ionic/components/menu/test/overlay/index.ts b/ionic/components/menu/test/overlay/index.ts index 02f1dee577..95a9a862ed 100644 --- a/ionic/components/menu/test/overlay/index.ts +++ b/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'}) diff --git a/ionic/components/menu/test/push/index.ts b/ionic/components/menu/test/push/index.ts index 02f1dee577..95a9a862ed 100644 --- a/ionic/components/menu/test/push/index.ts +++ b/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'}) diff --git a/ionic/components/menu/test/reveal/index.ts b/ionic/components/menu/test/reveal/index.ts index 02f1dee577..95a9a862ed 100644 --- a/ionic/components/menu/test/reveal/index.ts +++ b/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'}) diff --git a/ionic/components/modal/modal.ts b/ionic/components/modal/modal.ts index b8c0009c7c..e583baf44b 100644 --- a/ionic/components/modal/modal.ts +++ b/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 { diff --git a/ionic/components/modal/test/basic/index.ts b/ionic/components/modal/test/basic/index.ts index 4da65e1793..1307009a72 100644 --- a/ionic/components/modal/test/basic/index.ts +++ b/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({ diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts index 3516e4156a..a48e236294 100644 --- a/ionic/components/nav/nav-controller.ts +++ b/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'; diff --git a/ionic/components/nav/test/basic/index.ts b/ionic/components/nav/test/basic/index.ts index 069756f8e0..776e0e2f4d 100644 --- a/ionic/components/nav/test/basic/index.ts +++ b/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({ diff --git a/ionic/components/nav/test/insert-views/index.ts b/ionic/components/nav/test/insert-views/index.ts index 168e348d2a..aafd95a5a4 100644 --- a/ionic/components/nav/test/insert-views/index.ts +++ b/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'; diff --git a/ionic/components/nav/test/memory/index.ts b/ionic/components/nav/test/memory/index.ts index 4726f0b3db..4b39bd49a2 100644 --- a/ionic/components/nav/test/memory/index.ts +++ b/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; diff --git a/ionic/components/nav/test/nav-controller.spec.ts b/ionic/components/nav/test/nav-controller.spec.ts index fa95264e0b..5cd9a271cf 100644 --- a/ionic/components/nav/test/nav-controller.spec.ts +++ b/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', () => { diff --git a/ionic/components/nav/test/nested/index.ts b/ionic/components/nav/test/nested/index.ts index 3339ea7e3a..80c8c9c26c 100644 --- a/ionic/components/nav/test/nested/index.ts +++ b/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({ diff --git a/ionic/components/nav/test/routing/index.ts b/ionic/components/nav/test/routing/index.ts index 45c0b14278..faf53d7c93 100644 --- a/ionic/components/nav/test/routing/index.ts +++ b/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'}) diff --git a/ionic/components/nav/view-controller.ts b/ionic/components/nav/view-controller.ts index f5637cca65..881f271b8b 100644 --- a/ionic/components/nav/view-controller.ts +++ b/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){ diff --git a/ionic/components/radio/test/basic/index.ts b/ionic/components/radio/test/basic/index.ts index 8cf419fe03..a112bc9eec 100644 --- a/ionic/components/radio/test/basic/index.ts +++ b/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'; diff --git a/ionic/components/scroll/test/basic/index.ts b/ionic/components/scroll/test/basic/index.ts index 5a02c325b6..6a8f49ed9f 100644 --- a/ionic/components/scroll/test/basic/index.ts +++ b/ionic/components/scroll/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/scroll/test/pull-to-refresh/index.ts b/ionic/components/scroll/test/pull-to-refresh/index.ts index af2092418f..fa5d12f25e 100644 --- a/ionic/components/scroll/test/pull-to-refresh/index.ts +++ b/ionic/components/scroll/test/pull-to-refresh/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/searchbar/test/floating/index.ts b/ionic/components/searchbar/test/floating/index.ts index 0844e09d10..9152c1a916 100644 --- a/ionic/components/searchbar/test/floating/index.ts +++ b/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', diff --git a/ionic/components/searchbar/test/nav/index.ts b/ionic/components/searchbar/test/nav/index.ts index 10f1a73c9c..33aa546f6a 100644 --- a/ionic/components/searchbar/test/nav/index.ts +++ b/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' diff --git a/ionic/components/searchbar/test/toolbar/index.ts b/ionic/components/searchbar/test/toolbar/index.ts index 119aac7c69..ead1e6d035 100644 --- a/ionic/components/searchbar/test/toolbar/index.ts +++ b/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' diff --git a/ionic/components/segment/test/basic/index.ts b/ionic/components/segment/test/basic/index.ts index 7898550f4e..a6a59513e5 100644 --- a/ionic/components/segment/test/basic/index.ts +++ b/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({ diff --git a/ionic/components/segment/test/nav/index.ts b/ionic/components/segment/test/nav/index.ts index e8b40ba636..10a50ce640 100644 --- a/ionic/components/segment/test/nav/index.ts +++ b/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({ diff --git a/ionic/components/segment/test/swipe/index.ts b/ionic/components/segment/test/swipe/index.ts index 158b6ec662..10f148a8a8 100644 --- a/ionic/components/segment/test/swipe/index.ts +++ b/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({ diff --git a/ionic/components/select/test/multiple-value/index.ts b/ionic/components/select/test/multiple-value/index.ts index ecedff89d8..a199048781 100644 --- a/ionic/components/select/test/multiple-value/index.ts +++ b/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({ diff --git a/ionic/components/select/test/single-value/index.ts b/ionic/components/select/test/single-value/index.ts index 8d15e7b3a8..e9100120dd 100644 --- a/ionic/components/select/test/single-value/index.ts +++ b/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({ diff --git a/ionic/components/show-hide-when/test/basic/index.ts b/ionic/components/show-hide-when/test/basic/index.ts index 43da3f5c87..35b83fd343 100644 --- a/ionic/components/show-hide-when/test/basic/index.ts +++ b/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, diff --git a/ionic/components/slides/test/basic/index.ts b/ionic/components/slides/test/basic/index.ts index 0a7c251439..8cb8e99066 100644 --- a/ionic/components/slides/test/basic/index.ts +++ b/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({ diff --git a/ionic/components/slides/test/intro/index.ts b/ionic/components/slides/test/intro/index.ts index 3049d44937..bf0e0681c9 100644 --- a/ionic/components/slides/test/intro/index.ts +++ b/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({ diff --git a/ionic/components/slides/test/loop/index.ts b/ionic/components/slides/test/loop/index.ts index 0c7e34b07c..0161446db7 100644 --- a/ionic/components/slides/test/loop/index.ts +++ b/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' diff --git a/ionic/components/slides/test/scroll/index.ts b/ionic/components/slides/test/scroll/index.ts index 1f71954369..b4c8c54f5f 100644 --- a/ionic/components/slides/test/scroll/index.ts +++ b/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', diff --git a/ionic/components/tabs/test/advanced/index.ts b/ionic/components/tabs/test/advanced/index.ts index 3f83548238..7756062ab3 100644 --- a/ionic/components/tabs/test/advanced/index.ts +++ b/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({ diff --git a/ionic/components/tabs/test/badges/index.ts b/ionic/components/tabs/test/badges/index.ts index afc358b1fa..f7c14c36bf 100644 --- a/ionic/components/tabs/test/badges/index.ts +++ b/ionic/components/tabs/test/badges/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/tabs/test/basic/index.ts b/ionic/components/tabs/test/basic/index.ts index b859cb557b..0c5085c3c7 100644 --- a/ionic/components/tabs/test/basic/index.ts +++ b/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 diff --git a/ionic/components/tabs/test/ghost/index.ts b/ionic/components/tabs/test/ghost/index.ts index 1de90c7070..21172dd17d 100644 --- a/ionic/components/tabs/test/ghost/index.ts +++ b/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'; diff --git a/ionic/components/tabs/test/tab-bar-scenarios/index.ts b/ionic/components/tabs/test/tab-bar-scenarios/index.ts index 67b9bf20ba..65cc21401b 100644 --- a/ionic/components/tabs/test/tab-bar-scenarios/index.ts +++ b/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'}) diff --git a/ionic/components/tap-click/test/tapClick.spec.ts b/ionic/components/tap-click/test/tapClick.spec.ts index 58f7d64ac7..5ef164aeba 100644 --- a/ionic/components/tap-click/test/tapClick.spec.ts +++ b/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() { diff --git a/ionic/components/toggle/test/basic/index.ts b/ionic/components/toggle/test/basic/index.ts index 171c4ad97f..eb70bf9783 100644 --- a/ionic/components/toggle/test/basic/index.ts +++ b/ionic/components/toggle/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; import { Control, ControlGroup, diff --git a/ionic/components/toolbar/test/colors/index.ts b/ionic/components/toolbar/test/colors/index.ts index bc269a63d8..10f6fec745 100644 --- a/ionic/components/toolbar/test/colors/index.ts +++ b/ionic/components/toolbar/test/colors/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/components/toolbar/test/scenarios/index.ts b/ionic/components/toolbar/test/scenarios/index.ts index bc269a63d8..10f6fec745 100644 --- a/ionic/components/toolbar/test/scenarios/index.ts +++ b/ionic/components/toolbar/test/scenarios/index.ts @@ -1,4 +1,4 @@ -import {App} from '../../../../../ionic/ionic'; +import {App} from 'ionic-angular'; @App({ diff --git a/ionic/config/test/config.spec.ts b/ionic/config/test/config.spec.ts index b6178273f7..9db6e0708b 100644 --- a/ionic/config/test/config.spec.ts +++ b/ionic/config/test/config.spec.ts @@ -1,4 +1,4 @@ -import {Config, Platform, ionicProviders} from '../../../ionic/ionic'; +import {Config, Platform, ionicProviders} from 'ionic-angular'; export function run() { diff --git a/ionic/decorators/app.ts b/ionic/decorators/app.ts index c16539c14e..8f885d8e86 100644 --- a/ionic/decorators/app.ts +++ b/ionic/decorators/app.ts @@ -45,7 +45,7 @@ export interface AppMetadata { * * @usage * ```ts -* import {App} from 'ionic/ionic'; +* import {App} from 'ionic-angular'; * * @App({ * templateUrl: 'app/app.html', diff --git a/ionic/decorators/page.ts b/ionic/decorators/page.ts index f7511f5fcf..18adba1204 100644 --- a/ionic/decorators/page.ts +++ b/ionic/decorators/page.ts @@ -61,7 +61,7 @@ export interface PageMetadata { * In this case, you would add `IONIC_DIRECTIVES` to your directives array. * * ```ts - * import {IONIC_DIRECTIVES} from 'ionic/ionic'; + * import {IONIC_DIRECTIVES} from 'ionic-angular'; * @Component({ * selector: 'my-component' * template: `
@@ -75,7 +75,7 @@ export interface PageMetadata { * Alternatively, you could: * * ```ts - * import {Checkbox, Icon} from 'ionic/ionic' + * import {Checkbox, Icon} from 'ionic-angular' * ``` * * along with any other components and add them individually: diff --git a/ionic/platform/platform.ts b/ionic/platform/platform.ts index 66a7c1a548..24448ff47a 100644 --- a/ionic/platform/platform.ts +++ b/ionic/platform/platform.ts @@ -12,7 +12,7 @@ import {Config} from '../config/config'; * * @usage * ```ts - * import {Platform} 'ionic/ionic'; + * import {Platform} 'ionic-angular'; * export MyClass { * constructor(platform: Platform){ * this.platform = platform; @@ -57,7 +57,7 @@ export class Platform { * Depending on the platform name, isPlatform will return true or flase * * ``` - * import {Platform} 'ionic/ionic'; + * import {Platform} 'ionic-angular'; * export MyClass { * constructor(platform: Platform){ * this.platform = platform; @@ -81,7 +81,7 @@ export class Platform { * it would return mobile, ios, and iphone. * * ``` - * import {Platform} 'ionic/ionic'; + * import {Platform} 'ionic-angular'; * export MyClass { * constructor(platform: Platform){ * this.platform = platform; @@ -103,7 +103,7 @@ export class Platform { * Returns an object containing information about the paltform * * ``` - * import {Platform} 'ionic/ionic'; + * import {Platform} 'ionic-angular'; * export MyClass { * constructor(platform: Platform){ * this.platform = platform; @@ -142,7 +142,7 @@ export class Platform { * Returns a promise when the platform is ready and native functionality can be called * * ``` - * import {Platform} 'ionic/ionic'; + * import {Platform} 'ionic-angular'; * export MyClass { * constructor(platform: Platform){ * this.platform = platform; diff --git a/ionic/platform/storage/local-storage.ts b/ionic/platform/storage/local-storage.ts index 5d9b2c8af9..fdef90a2e0 100644 --- a/ionic/platform/storage/local-storage.ts +++ b/ionic/platform/storage/local-storage.ts @@ -15,7 +15,7 @@ import {StorageEngine} from './storage'; * * @usage * ```ts - * import {Page, Storage, LocalStorage} from 'ionic/ionic'; + * import {Page, Storage, LocalStorage} from 'ionic-angular'; * @Page({ * template: `` * }); diff --git a/ionic/platform/test/platform.spec.ts b/ionic/platform/test/platform.spec.ts index ad748cf213..5191bbe7f0 100644 --- a/ionic/platform/test/platform.spec.ts +++ b/ionic/platform/test/platform.spec.ts @@ -1,4 +1,4 @@ -import {Platform} from '../../../ionic/ionic'; +import {Platform} from 'ionic-angular'; export function run() { diff --git a/scripts/demos/index.template.dev.html b/scripts/demos/index.template.dev.html index 2085214ab7..84f5fd335a 100644 --- a/scripts/demos/index.template.dev.html +++ b/scripts/demos/index.template.dev.html @@ -15,8 +15,12 @@ diff --git a/scripts/e2e/e2e.template.html b/scripts/e2e/e2e.template.html index 71a6c8c1cd..09bfc7b0a7 100644 --- a/scripts/e2e/e2e.template.html +++ b/scripts/e2e/e2e.template.html @@ -39,8 +39,12 @@