diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts index 11cdd621b5..bf984d76e9 100644 --- a/ionic/components/nav/nav-controller.ts +++ b/ionic/components/nav/nav-controller.ts @@ -56,7 +56,7 @@ import {raf, rafFrames} from '../../util/dom'; * *

Page creation

* _For more information on the `@Page` decorator see the [@Page API - * reference](../../../config/decorators/Page/)._ + * reference](../../../decorators/Page/)._ * * Pages are created when they are added to the navigation stack. For methods * like [push()](#push), the NavController takes any component class that is diff --git a/ionic/components/nav/nav.ts b/ionic/components/nav/nav.ts index 23322b7241..8ec2d4ac85 100644 --- a/ionic/components/nav/nav.ts +++ b/ionic/components/nav/nav.ts @@ -3,7 +3,7 @@ import {ChangeDetectorRef, Component, Directive, ElementRef, Host, Optional, for import {IonicApp} from '../app/app'; import {Config} from '../../config/config'; import {Keyboard} from '../../util/keyboard'; -import {ConfigComponent} from '../../config/decorators'; +import {ConfigComponent} from '../../decorators/config-component'; import {NavController} from './nav-controller'; import {ViewController} from './view-controller'; diff --git a/ionic/components/navbar/navbar.ts b/ionic/components/navbar/navbar.ts index 99544590ea..824236bad6 100644 --- a/ionic/components/navbar/navbar.ts +++ b/ionic/components/navbar/navbar.ts @@ -4,7 +4,6 @@ import {Ion} from '../ion'; import {Icon} from '../icon/icon'; import {ToolbarBase} from '../toolbar/toolbar'; import {Config} from '../../config/config'; -import {Page} from '../../config/decorators'; import {IonicApp} from '../app/app'; import {ViewController} from '../nav/view-controller'; import {NavController} from '../nav/nav-controller'; diff --git a/ionic/components/searchbar/searchbar.ts b/ionic/components/searchbar/searchbar.ts index 4214c1db20..bd7215803c 100644 --- a/ionic/components/searchbar/searchbar.ts +++ b/ionic/components/searchbar/searchbar.ts @@ -3,7 +3,7 @@ import {NgIf, NgClass, NgControl, FORM_DIRECTIVES} from 'angular2/common'; import {Ion} from '../ion'; import {Config} from '../../config/config'; -import {ConfigComponent} from '../../config/decorators'; +import {ConfigComponent} from '../../decorators/config-component'; import {Icon} from '../icon/icon'; import {Button} from '../button/button'; diff --git a/ionic/components/tabs/tabs.ts b/ionic/components/tabs/tabs.ts index a46b7bae11..076c26f2c4 100644 --- a/ionic/components/tabs/tabs.ts +++ b/ionic/components/tabs/tabs.ts @@ -7,7 +7,7 @@ import {Config} from '../../config/config'; import {Platform} from '../../platform/platform'; import {NavController} from '../nav/nav-controller'; import {ViewController} from '../nav/view-controller'; -import {ConfigComponent} from '../../config/decorators'; +import {ConfigComponent} from '../../decorators/config-component'; import {Icon} from '../icon/icon'; import {rafFrames} from '../../util/dom'; diff --git a/ionic/config/decorators.ts b/ionic/config/decorators.ts deleted file mode 100644 index d084e2db3c..0000000000 --- a/ionic/config/decorators.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './decorators/config-component' -export * from './decorators/app' -export * from './decorators/page' diff --git a/ionic/config/decorators/app.ts b/ionic/decorators/app.ts similarity index 90% rename from ionic/config/decorators/app.ts rename to ionic/decorators/app.ts index bcf98b4f6f..071598cbe1 100644 --- a/ionic/config/decorators/app.ts +++ b/ionic/decorators/app.ts @@ -1,8 +1,8 @@ import {Component} from 'angular2/core'; import {bootstrap} from 'angular2/platform/browser'; -import {TapClick} from '../../components/tap-click/tap-click'; -import {ionicProviders} from '../bootstrap'; -import {IONIC_DIRECTIVES} from '../directives'; +import {TapClick} from '../components/tap-click/tap-click'; +import {ionicProviders} from '../config/bootstrap'; +import {IONIC_DIRECTIVES} from '../config/directives'; /** * @name App diff --git a/ionic/config/decorators/config-component.ts b/ionic/decorators/config-component.ts similarity index 94% rename from ionic/config/decorators/config-component.ts rename to ionic/decorators/config-component.ts index ae0e9c6af1..c55605b039 100644 --- a/ionic/config/decorators/config-component.ts +++ b/ionic/decorators/config-component.ts @@ -1,5 +1,4 @@ import {Component} from 'angular2/core' -import {pascalCaseToDashCase} from '../../util/util'; /** diff --git a/ionic/config/decorators/page.ts b/ionic/decorators/page.ts similarity index 97% rename from ionic/config/decorators/page.ts rename to ionic/decorators/page.ts index 028153506e..d8fe538daa 100644 --- a/ionic/config/decorators/page.ts +++ b/ionic/decorators/page.ts @@ -1,5 +1,5 @@ import {Component} from 'angular2/core' -import {IONIC_DIRECTIVES} from '../directives'; +import {IONIC_DIRECTIVES} from '../config/directives'; /** diff --git a/ionic/ionic.ts b/ionic/ionic.ts index 8b2f658203..478c0f55ec 100644 --- a/ionic/ionic.ts +++ b/ionic/ionic.ts @@ -1,9 +1,12 @@ export * from './config/bootstrap' export * from './config/config' -export * from './config/decorators' export * from './config/directives' +export * from './decorators/config-component' +export * from './decorators/app' +export * from './decorators/page' + export * from './components' export * from './platform/platform' @@ -25,4 +28,3 @@ import './platform/registry' import './animations/builtins' import './animations/ios-transition' import './animations/md-transition' -