diff --git a/ionic/components/card/card.ts b/ionic/components/card/card.ts index 552aa7393c..238898e144 100644 --- a/ionic/components/card/card.ts +++ b/ionic/components/card/card.ts @@ -2,7 +2,7 @@ import {ElementRef} from 'angular2/angular2'; import {Ion} from '../ion'; import {IonicConfig} from '../../config/config'; -import {IonicDirective} from '../../config/annotations'; +import {IonicDirective} from '../../config/decorators'; import {ListVirtualScroll} from './virtual'; import * as util from 'ionic/util'; diff --git a/ionic/components/checkbox/checkbox.ts b/ionic/components/checkbox/checkbox.ts index 38599d1dcb..6ba1d362bc 100644 --- a/ionic/components/checkbox/checkbox.ts +++ b/ionic/components/checkbox/checkbox.ts @@ -9,7 +9,7 @@ import { import {Ion} from '../ion'; import {IonInput} from '../form/input'; import {IonicConfig} from '../../config/config'; -import {IonicComponent, IonicView} from '../../config/annotations'; +import {IonicComponent, IonicView} from '../../config/decorators'; /** * @name ionCheckbox diff --git a/ionic/components/content/content.ts b/ionic/components/content/content.ts index f30851ceee..96ebaed27e 100644 --- a/ionic/components/content/content.ts +++ b/ionic/components/content/content.ts @@ -3,7 +3,7 @@ import {Component, View, ElementRef} from 'angular2/angular2'; import {Ion} from '../ion'; import {IonicConfig} from '../../config/config'; import {IonicPlatform} from '../../platform/platform'; -import {IonicComponent} from '../../config/annotations'; +import {IonicComponent} from '../../config/decorators'; import {ScrollTo} from '../../animations/scroll-to'; diff --git a/ionic/components/icon/icon.ts b/ionic/components/icon/icon.ts index e489ab74ff..aec90ce05c 100644 --- a/ionic/components/icon/icon.ts +++ b/ionic/components/icon/icon.ts @@ -1,7 +1,7 @@ import {Directive, View, NgClass, ElementRef, Optional, Host, Attribute, Renderer} from 'angular2/angular2'; import {IonicConfig} from '../../config/config'; -import {IonicComponent} from '../../config/annotations'; +import {IonicComponent} from '../../config/decorators'; import {Ion} from '../ion'; import {Button} from '../button/button'; diff --git a/ionic/components/list/list.ts b/ionic/components/list/list.ts index 0e33dad135..88a831ccfd 100644 --- a/ionic/components/list/list.ts +++ b/ionic/components/list/list.ts @@ -2,7 +2,7 @@ import {Directive, ElementRef} from 'angular2/angular2'; import {Ion} from '../ion'; import {IonicConfig} from '../../config/config'; -import {IonicDirective} from '../../config/annotations'; +import {IonicDirective} from '../../config/decorators'; import {ListVirtualScroll} from './virtual'; import * as util from 'ionic/util'; diff --git a/ionic/components/menu/menu.ts b/ionic/components/menu/menu.ts index e980069aa4..0043cdfa55 100644 --- a/ionic/components/menu/menu.ts +++ b/ionic/components/menu/menu.ts @@ -3,7 +3,7 @@ import {forwardRef, Directive, Host, View, EventEmitter, ElementRef} from 'angul import {Ion} from '../ion'; import {IonicApp} from '../app/app'; import {IonicConfig} from '../../config/config'; -import {IonicComponent} from '../../config/annotations'; +import {IonicComponent} from '../../config/decorators'; import {IonicPlatform} from '../../platform/platform'; import * as gestures from './menu-gestures'; diff --git a/ionic/components/nav-bar/nav-bar.ts b/ionic/components/nav-bar/nav-bar.ts index 8a336af475..5e992a575e 100644 --- a/ionic/components/nav-bar/nav-bar.ts +++ b/ionic/components/nav-bar/nav-bar.ts @@ -3,7 +3,7 @@ import {Component, Directive, View, Optional, ElementRef, TemplateRef, forwardRe import {Ion} from '../ion'; import {ToolbarBase} from '../toolbar/toolbar'; import {IonicConfig} from '../../config/config'; -import {IonicView} from '../../config/annotations'; +import {IonicView} from '../../config/decorators'; import {IonicApp} from '../app/app'; import {ViewItem} from '../view/view-item'; import {ViewController} from '../view/view-controller'; diff --git a/ionic/components/nav/nav.ts b/ionic/components/nav/nav.ts index 729eba6fe3..7a9170bcb3 100644 --- a/ionic/components/nav/nav.ts +++ b/ionic/components/nav/nav.ts @@ -1,6 +1,6 @@ import {Directive, View, ElementRef, Host, Optional, forwardRef, Injector, NgZone} from 'angular2/angular2'; -import {IonicComponent} from '../../config/annotations'; +import {IonicComponent} from '../../config/decorators'; import {ViewController} from '../view/view-controller'; /** diff --git a/ionic/components/nav/pane.ts b/ionic/components/nav/pane.ts index 6181fedc2b..4de8944bce 100644 --- a/ionic/components/nav/pane.ts +++ b/ionic/components/nav/pane.ts @@ -3,7 +3,7 @@ import {Component, Directive, View, ElementRef, Inject, forwardRef, Injector, bi import {Ion} from '../ion'; import {IonicConfig} from '../../config/config'; import {ViewController} from '../view/view-controller'; -import {IonicComponent} from '../../config/annotations'; +import {IonicComponent} from '../../config/decorators'; import {PaneAnchor, PaneContentAnchor, NavBarContainer} from './anchors'; /** diff --git a/ionic/components/radio/radio.ts b/ionic/components/radio/radio.ts index edda986e04..b1a158e793 100644 --- a/ionic/components/radio/radio.ts +++ b/ionic/components/radio/radio.ts @@ -1,6 +1,6 @@ import {ElementRef, Host, Optional, NgControl, Query, QueryList} from 'angular2/angular2'; -import {IonicDirective, IonicComponent, IonicView} from '../../config/annotations'; +import {IonicDirective, IonicComponent, IonicView} from '../../config/decorators'; import {IonicConfig} from '../../config/config'; import {Ion} from '../ion'; import {ListHeader} from '../list/list'; diff --git a/ionic/components/scroll/scroll.ts b/ionic/components/scroll/scroll.ts index e95c13b842..1e9dd408b8 100644 --- a/ionic/components/scroll/scroll.ts +++ b/ionic/components/scroll/scroll.ts @@ -2,7 +2,7 @@ import {View, ElementRef, onInit} from 'angular2/angular2'; import {Ion} from '../ion'; import {IonicConfig} from '../../config/config'; -import {IonicComponent} from '../../config/annotations'; +import {IonicComponent} from '../../config/decorators'; import {Gesture} from '../../gestures/gesture'; import {CSS} from '../../util/dom'; import {Animation} from '../../animations/animation'; diff --git a/ionic/components/search-bar/search-bar.ts b/ionic/components/search-bar/search-bar.ts index 704172511c..e137b0dc7b 100644 --- a/ionic/components/search-bar/search-bar.ts +++ b/ionic/components/search-bar/search-bar.ts @@ -3,7 +3,7 @@ import {ElementRef, Pipe} from 'angular2/angular2'; import {Ion} from '../ion'; import {IonicConfig} from '../../config/config'; -import {IonicComponent, IonicView} from '../../config/annotations'; +import {IonicComponent, IonicView} from '../../config/decorators'; /** * TODO diff --git a/ionic/components/segment/segment.ts b/ionic/components/segment/segment.ts index 41e511b8dc..9e7114b7f6 100644 --- a/ionic/components/segment/segment.ts +++ b/ionic/components/segment/segment.ts @@ -4,7 +4,7 @@ import {ControlGroup, ControlDirective} from 'angular2/forms' import {Ion} from '../ion'; import {IonicConfig} from '../../config/config'; -import {IonicDirective, IonicComponent} from '../../config/annotations' +import {IonicDirective, IonicComponent} from '../../config/decorators' import {dom} from 'ionic/util'; /** diff --git a/ionic/components/slides/slides.ts b/ionic/components/slides/slides.ts index 69f420c7d0..39e1ca3083 100644 --- a/ionic/components/slides/slides.ts +++ b/ionic/components/slides/slides.ts @@ -5,7 +5,7 @@ import {Ion} from '../ion'; import {Animation} from 'ionic/animations/animation'; import {Gesture} from 'ionic/gestures/gesture'; import {DragGesture} from 'ionic/gestures/drag-gesture'; -import {IonicComponent, IonicDirective} from '../../config/annotations'; +import {IonicComponent, IonicDirective} from '../../config/decorators'; import {IonicConfig} from '../../config/config'; import {dom} from 'ionic/util'; import {CSS} from '../../util/dom'; diff --git a/ionic/components/switch/switch.ts b/ionic/components/switch/switch.ts index 2d2ce875d0..433e87b02c 100644 --- a/ionic/components/switch/switch.ts +++ b/ionic/components/switch/switch.ts @@ -13,7 +13,7 @@ import { import {Ion} from '../ion'; import {IonInput} from '../form/input'; import {IonicConfig} from '../../config/config'; -import {IonicComponent, IonicView} from '../../config/annotations'; +import {IonicComponent, IonicView} from '../../config/decorators'; import {pointerCoord} from '../../util/dom'; /** diff --git a/ionic/components/tabs/tabs.ts b/ionic/components/tabs/tabs.ts index bd4d3eb51d..3dfb8af5d3 100644 --- a/ionic/components/tabs/tabs.ts +++ b/ionic/components/tabs/tabs.ts @@ -4,7 +4,7 @@ import {IonicApp} from '../app/app'; import {ViewController} from '../view/view-controller'; import {ViewItem} from '../view/view-item'; import {Icon} from '../icon/icon'; -import {IonicComponent, IonicView} from '../../config/annotations'; +import {IonicComponent, IonicView} from '../../config/decorators'; /** * @name ionTabs diff --git a/ionic/components/text-input/text-input.ts b/ionic/components/text-input/text-input.ts index 020922d62e..f21fd87097 100644 --- a/ionic/components/text-input/text-input.ts +++ b/ionic/components/text-input/text-input.ts @@ -1,6 +1,6 @@ import {Directive, View, Host, Optional, ElementRef, Attribute, Query, QueryList, NgZone} from 'angular2/angular2'; -import {IonicDirective} from '../../config/annotations'; +import {IonicDirective} from '../../config/decorators'; import {IonicConfig} from '../../config/config'; import {IonInput} from '../form/input'; import {Label} from './label'; diff --git a/ionic/components/toolbar/toolbar.ts b/ionic/components/toolbar/toolbar.ts index 4aacc02b02..beb1fbf988 100644 --- a/ionic/components/toolbar/toolbar.ts +++ b/ionic/components/toolbar/toolbar.ts @@ -2,7 +2,7 @@ import {Component, Directive, View, Host, ElementRef, Optional, forwardRef, Inje import {Ion} from '../ion'; import {IonicConfig} from '../../config/config'; -import {IonicView} from '../../config/annotations'; +import {IonicView} from '../../config/decorators'; import {MenuToggle} from '../menu/menu-toggle'; import {Navbar} from '../nav-bar/nav-bar'; diff --git a/ionic/config/annotations.ts b/ionic/config/decorators.ts similarity index 100% rename from ionic/config/annotations.ts rename to ionic/config/decorators.ts diff --git a/ionic/ionic.ts b/ionic/ionic.ts index 2c82eb6060..59393fabc0 100644 --- a/ionic/ionic.ts +++ b/ionic/ionic.ts @@ -1,7 +1,7 @@ export * from './config/config' export * from './config/modes' -export * from './config/annotations' +export * from './config/decorators' export * from './net/http'