From 02de37eaab64b72ff5663ff907c367e5a01cc42d Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 3 Apr 2015 09:25:03 -0600 Subject: [PATCH] remove source references to ionic2/components --- src/components.js | 1 + .../test/figure-it-out/components/stylers.js | 30 --------------- .../figure-it-out/components/tabs-page.js | 26 ------------- .../app/test/figure-it-out/index.html | 3 -- src/components/app/test/figure-it-out/main.js | 38 ------------------- src/components/item/item-swipe-buttons.js | 2 +- src/components/nav-view/nav-view.js | 3 +- .../nav-viewport/test/basic/main.js | 2 +- src/components/tabs/tab.js | 4 +- src/components/toolbar/toolbar.js | 1 - src/components/view/view.js | 3 -- 11 files changed, 8 insertions(+), 105 deletions(-) delete mode 100644 src/components/app/test/figure-it-out/components/stylers.js delete mode 100644 src/components/app/test/figure-it-out/components/tabs-page.js delete mode 100644 src/components/app/test/figure-it-out/index.html delete mode 100644 src/components/app/test/figure-it-out/main.js diff --git a/src/components.js b/src/components.js index 5aa7726f0e..4698481368 100644 --- a/src/components.js +++ b/src/components.js @@ -1,3 +1,4 @@ +// DON'T reference this file in the source. Only in demos. export * from 'ionic2/components/action-menu/action-menu' export * from 'ionic2/components/alert/alert' export * from 'ionic2/components/aside/aside' diff --git a/src/components/app/test/figure-it-out/components/stylers.js b/src/components/app/test/figure-it-out/components/stylers.js deleted file mode 100644 index da9cf0f01f..0000000000 --- a/src/components/app/test/figure-it-out/components/stylers.js +++ /dev/null @@ -1,30 +0,0 @@ -import {Component, NgElement, Template} from 'angular2/angular2'; - -@Component({ - selector: '[red-bg]' -}) -@Template({ - inline: 'red template' -}) -export class RedBgStyler { - constructor( - element:NgElement - ) { - element.domElement.style.background = 'red'; - } - -} - -@Component({ - selector: '[blue-bg]' -}) -@Template({ - inline: 'blue template' -}) -export class BlueTextStyler { - constructor( - element:NgElement - ) { - element.domElement.style.color = 'blue'; - } -} diff --git a/src/components/app/test/figure-it-out/components/tabs-page.js b/src/components/app/test/figure-it-out/components/tabs-page.js deleted file mode 100644 index be8da85cf9..0000000000 --- a/src/components/app/test/figure-it-out/components/tabs-page.js +++ /dev/null @@ -1,26 +0,0 @@ -import {Component, Template, bootstrap} from 'angular2/angular2'; -import {Tabs, Tab} from 'ionic2/components/tabs/tabs2'; - -/* -@Route('tabs') -*/ -@Component({ - selector: 'tabs-page' -}) -@Template({ - inline: ` - - - One content - - - Two content - - - `, - directives: [Tabs, Tab] -}) -export class TabsPage { - constructor() { - } -} diff --git a/src/components/app/test/figure-it-out/index.html b/src/components/app/test/figure-it-out/index.html deleted file mode 100644 index d116bc3723..0000000000 --- a/src/components/app/test/figure-it-out/index.html +++ /dev/null @@ -1,3 +0,0 @@ - - Loading... - diff --git a/src/components/app/test/figure-it-out/main.js b/src/components/app/test/figure-it-out/main.js deleted file mode 100644 index 279924e417..0000000000 --- a/src/components/app/test/figure-it-out/main.js +++ /dev/null @@ -1,38 +0,0 @@ -import {DynamicComponent, Component, Template, bootstrap, NgElement} from 'angular2/angular2'; -import {Inject} from 'angular2/di'; -import {PrivateComponentLoader} from 'angular2/src/core/compiler/private_component_loader'; -import {PrivateComponentLocation} from 'angular2/src/core/compiler/private_component_location'; -import {RedBgStyler, BlueTextStyler} from 'ionic2/components/stylers'; - -@DynamicComponent({ - selector: 'dynamic-component', - services: [PrivateComponentLoader, PrivateComponentLocation] -}) -class MyDynamic { - - constructor( - loader:PrivateComponentLoader, - location:PrivateComponentLocation - ) { - loader.load(RedBgStyler, location); - loader.load(BlueTextStyler, location); - } -} - - -@Component({ - selector: 'my-app' -}) -@Template({ - inline: ` - Hello! - `, - directives: [MyDynamic], -}) -class MyApp { - constructor() { - console.log('MyApp loaded'); - } -} - -bootstrap(MyApp); diff --git a/src/components/item/item-swipe-buttons.js b/src/components/item/item-swipe-buttons.js index f37087c493..aa9a8b1e72 100644 --- a/src/components/item/item-swipe-buttons.js +++ b/src/components/item/item-swipe-buttons.js @@ -1,5 +1,5 @@ import {Parent, NgElement, Decorator} from 'angular2/angular2' -import {Item} from 'ionic2/components' +import {Item} from 'ionic2/components/item/item' import {SlideGesture} from 'ionic2/gestures/slide-gesture' @Decorator({ diff --git a/src/components/nav-view/nav-view.js b/src/components/nav-view/nav-view.js index 1a89bb127e..1d63c56623 100644 --- a/src/components/nav-view/nav-view.js +++ b/src/components/nav-view/nav-view.js @@ -1,6 +1,7 @@ import {DynamicComponent, Ancestor, NgElement} from 'angular2/angular2' import {Optional} from 'angular2/src/di/annotations' -import {NavViewport, Tabs} from 'ionic2/components' +import {NavViewport} from 'ionic2/components/nav-viewport/nav-viewport' +import {Tabs} from 'ionic2/components/tabs/tabs' import {PrivateComponentLoader} from 'angular2/src/core/compiler/private_component_loader' import {PrivateComponentLocation} from 'angular2/src/core/compiler/private_component_location' diff --git a/src/components/nav-viewport/test/basic/main.js b/src/components/nav-viewport/test/basic/main.js index 103a74c63c..d941df7ac7 100644 --- a/src/components/nav-viewport/test/basic/main.js +++ b/src/components/nav-viewport/test/basic/main.js @@ -1,6 +1,6 @@ import {bootstrap} from 'angular2/core' import {Component, Template} from 'angular2/angular2' -import {NavViewport} from 'ionic2/components' +import {NavViewport} from 'ionic2/components/nav-viewport/nav-viewport' import {Log} from 'ionic2/util' import {FirstPage} from 'app/pages/first-page' diff --git a/src/components/tabs/tab.js b/src/components/tabs/tab.js index a0ba40b642..5edf451e21 100644 --- a/src/components/tabs/tab.js +++ b/src/components/tabs/tab.js @@ -6,7 +6,9 @@ import { PropertySetter, For } from 'angular2/angular2'; -import {NavViewport, NavView, Tabs} from 'ionic2/components' +import {NavViewport} from 'ionic2/components/nav-viewport/nav-viewport' +import {NavView} from 'ionic2/components/nav-view/nav-view' +import {Tabs} from 'ionic2/components/tabs/tabs' import {IonicComponent} from 'ionic2/config/component' diff --git a/src/components/toolbar/toolbar.js b/src/components/toolbar/toolbar.js index 36d8ae37fc..b0724df570 100644 --- a/src/components/toolbar/toolbar.js +++ b/src/components/toolbar/toolbar.js @@ -1,7 +1,6 @@ import {NgElement, Component, Template, Ancestor} from 'angular2/angular2' import {Optional} from 'angular2/src/di/annotations' import {BackButton} from 'ionic2/components/toolbar/back-button' -import {Tabs, NavViewport, NavView} from 'ionic2/components' import {ComponentConfig} from 'ionic2/config/component-config' import {raf} from 'ionic2/util/dom' diff --git a/src/components/view/view.js b/src/components/view/view.js index a1e51ba1f8..2d4df09b27 100644 --- a/src/components/view/view.js +++ b/src/components/view/view.js @@ -2,9 +2,6 @@ import {NgElement, Component, Template, Parent, Ancestor} from 'angular2/angular import {Toolbar} from 'ionic2/components/toolbar/toolbar' import {ComponentConfig} from 'ionic2/config/component-config' -import {Tabs, NavViewport, NavView} from 'ionic2/components' -import {Optional} from 'angular2/src/di/annotations' - export let ViewConfig = new ComponentConfig('view') @Component({