rename IonicComponent stuff

This commit is contained in:
Adam Bradley
2015-06-18 19:01:00 -05:00
parent 6978a5b2fb
commit 8664566f48
15 changed files with 34 additions and 33 deletions

View File

@ -14,12 +14,12 @@ import {IonicRoot} from '../app/app';
import * as util from 'ionic/util'; import * as util from 'ionic/util';
import {Overlay} from '../overlay/overlay'; import {Overlay} from '../overlay/overlay';
import {IonicComponentNEW} from '../../config/component'; import {IonicComponent} from '../../config/component';
import {Animation} from 'ionic/animations/animation'; import {Animation} from 'ionic/animations/animation';
import {ClickBlock} from '../../util/click-block'; import {ClickBlock} from '../../util/click-block';
@IonicComponentNEW(ActionMenu) @IonicComponent(ActionMenu)
@View({ @View({
template: ` template: `
<div class="action-menu-backdrop" (click)="cancel()"></div> <div class="action-menu-backdrop" (click)="cancel()"></div>

View File

@ -6,7 +6,7 @@ import {View} from 'angular2/src/core/annotations_impl/view';
import * as types from 'ionic/components/aside/extensions/types' import * as types from 'ionic/components/aside/extensions/types'
import * as gestures from 'ionic/components/aside/extensions/gestures' import * as gestures from 'ionic/components/aside/extensions/gestures'
import {dom} from 'ionic/util' import {dom} from 'ionic/util'
import {IonicComponent} from 'ionic/config/component' import {IonicComponent_OLD} from 'ionic/config/component'
/** /**
* TODO (?) add docs about how to have a root aside and a nested aside, then hide the root one * TODO (?) add docs about how to have a root aside and a nested aside, then hide the root one
@ -97,7 +97,7 @@ export class Aside {
} }
} }
new IonicComponent(Aside, { new IonicComponent_OLD(Aside, {
properties: { properties: {
side: { side: {
value: 'left' value: 'left'

View File

@ -1,7 +1,8 @@
import { ElementRef} from 'angular2/angular2' import { ElementRef} from 'angular2/angular2'
import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
import {IonicComponent} from 'ionic/config/component' import {IonicComponent_OLD} from 'ionic/config/component'
@Directive({ @Directive({
selector: 'button, ion-button, [ion-button],.button', selector: 'button, ion-button, [ion-button],.button',
@ -9,13 +10,12 @@ import {IonicComponent} from 'ionic/config/component'
export class Button { export class Button {
constructor( constructor(
elementRef: ElementRef elementRef: ElementRef
//@NgElement() ngElement:NgElement
) { ) {
this.domElement = elementRef.domElement; this.domElement = elementRef.domElement;
this.config = Button.config.invoke(this); this.config = Button.config.invoke(this);
} }
} }
new IonicComponent(Button, { new IonicComponent_OLD(Button, {
enhanceRawElement: true, enhanceRawElement: true,
propClasses: ['primary', 'secondary', 'danger', 'light', 'stable', 'dark', 'block', 'clear', 'full', 'icon'] propClasses: ['primary', 'secondary', 'danger', 'light', 'stable', 'dark', 'block', 'clear', 'full', 'icon']
}) })

View File

@ -5,10 +5,10 @@ import {Ancestor} from 'angular2/src/core/annotations_impl/visibility';
import {View} from 'angular2/src/core/annotations_impl/view'; import {View} from 'angular2/src/core/annotations_impl/view';
//import {ControlGroup, ControlDirective} from 'angular2/forms'; //import {ControlGroup, ControlDirective} from 'angular2/forms';
import {IonicComponentNEW} from '../../config/component'; import {IonicComponent} from '../../config/component';
@IonicComponentNEW(Checkbox) @IonicComponent(Checkbox)
@View({ @View({
template: ` template: `
<div class="item-media media-checkbox"> <div class="item-media media-checkbox">

View File

@ -3,7 +3,7 @@ import {Component, Directive} from 'angular2/src/core/annotations_impl/annotatio
import {View} from 'angular2/src/core/annotations_impl/view'; import {View} from 'angular2/src/core/annotations_impl/view';
import {dom} from 'ionic/util' import {dom} from 'ionic/util'
import {IonicComponent} from 'ionic/config/component' import {IonicComponent_OLD} from 'ionic/config/component'
import { import {
ItemPrimaryOptions, ItemSecondaryOptions ItemPrimaryOptions, ItemSecondaryOptions
@ -60,7 +60,7 @@ export class Item {
} }
} }
new IonicComponent(Item, { new IonicComponent_OLD(Item, {
propClasses: ['full'] propClasses: ['full']
}) })

View File

@ -2,7 +2,7 @@ import {Renderer, ElementRef} from 'angular2/angular2'
import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
import {View} from 'angular2/src/core/annotations_impl/view'; import {View} from 'angular2/src/core/annotations_impl/view';
import {IonicComponent} from 'ionic/config/component' import {IonicComponent_OLD} from 'ionic/config/component'
import {ListVirtualScroll} from './virtual' import {ListVirtualScroll} from './virtual'
import * as util from 'ionic/util'; import * as util from 'ionic/util';
@ -49,6 +49,6 @@ export class List {
this.itemTemplate = item; this.itemTemplate = item;
} }
} }
new IonicComponent(List, { new IonicComponent_OLD(List, {
propClasses: ['inset'] propClasses: ['inset']
}) })

View File

@ -6,7 +6,7 @@ import {Parent, Ancestor} from 'angular2/src/core/annotations_impl/visibility';
import {Content, List, Item, Button, Modal, ModalRef} from 'ionic/ionic'; import {Content, List, Item, Button, Modal, ModalRef} from 'ionic/ionic';
import {Nav, IonicComponentNEW} from 'ionic/ionic'; import {Nav, IonicComponent} from 'ionic/ionic';
import {NavController, NavParams, NavbarTemplate, Navbar} from 'ionic/ionic'; import {NavController, NavParams, NavbarTemplate, Navbar} from 'ionic/ionic';
@ -22,7 +22,7 @@ export default class IonicApp {
} }
} }
@IonicComponentNEW(Modal) @IonicComponent(Modal)
@View({ @View({
template: '<ion-nav [initial]="initial"></ion-nav>', template: '<ion-nav [initial]="initial"></ion-nav>',
directives: [Nav, Button, Content] directives: [Nav, Button, Content]

View File

@ -7,7 +7,7 @@ import {bind} from 'angular2/di';
import {ViewController} from '../view/view-controller'; import {ViewController} from '../view/view-controller';
import {SwipeHandle} from './swipe-handle'; import {SwipeHandle} from './swipe-handle';
import {IonicComponentNEW} from '../../config/component'; import {IonicComponent} from '../../config/component';
export class PaneController { export class PaneController {
@ -87,7 +87,7 @@ export class PaneController {
} }
@IonicComponentNEW(Pane) @IonicComponent(Pane)
@View({ @View({
template: ` template: `
<template pane-anchor></template> <template pane-anchor></template>

View File

@ -4,7 +4,7 @@ import {Ancestor} from 'angular2/src/core/annotations_impl/visibility';
import {View} from 'angular2/src/core/annotations_impl/view'; import {View} from 'angular2/src/core/annotations_impl/view';
//import {ControlGroup, ControlDirective} from 'angular2/forms' //import {ControlGroup, ControlDirective} from 'angular2/forms'
import {IonicDirective, IonicComponentNEW} from 'ionic/config/component'; import {IonicDirective, IonicComponent} from 'ionic/config/component';
@IonicDirective(RadioGroup) @IonicDirective(RadioGroup)
@ -87,7 +87,7 @@ export class RadioGroup {
} }
@IonicComponentNEW(RadioButton) @IonicComponent(RadioButton)
@View({ @View({
template: ` template: `
<div class="item-content"> <div class="item-content">

View File

@ -4,7 +4,8 @@ import {View} from 'angular2/src/core/annotations_impl/view';
import {ControlGroup, ControlDirective} from 'angular2/forms' import {ControlGroup, ControlDirective} from 'angular2/forms'
import {IonicComponent} from 'ionic/config/component' import {IonicComponent_OLD} from 'ionic/config/component'
@Component({ @Component({
selector: 'ion-search-bar', selector: 'ion-search-bar',
@ -98,7 +99,7 @@ export class SearchPipe extends Pipe {
} }
*/ */
new IonicComponent(SearchBar, { new IonicComponent_OLD(SearchBar, {
properties: { properties: {
cancelText: { cancelText: {
defaults: { defaults: {

View File

@ -6,7 +6,7 @@ import {View} from 'angular2/src/core/annotations_impl/view';
import {ControlGroup, ControlDirective} from 'angular2/forms' import {ControlGroup, ControlDirective} from 'angular2/forms'
import {dom} from 'ionic/util'; import {dom} from 'ionic/util';
import {IonicComponent} from 'ionic/config/component' import {IonicComponent_OLD} from 'ionic/config/component'
import {Button} from 'ionic/components/button/button' import {Button} from 'ionic/components/button/button'
@ -103,7 +103,7 @@ export class Segment {
} }
} }
new IonicComponent(Segment, { new IonicComponent_OLD(Segment, {
}); });
@Component({ @Component({

View File

@ -9,7 +9,7 @@ import {DragGesture} from 'ionic/gestures/drag-gesture';
import * as util from 'ionic/util'; import * as util from 'ionic/util';
import {dom} from 'ionic/util' import {dom} from 'ionic/util'
import {IonicComponent} from 'ionic/config/component' import {IonicComponent_OLD} from 'ionic/config/component'
import {Hammer} from 'ionic/gestures/hammer'; import {Hammer} from 'ionic/gestures/hammer';
@ -464,7 +464,7 @@ export class Slides {
} }
} }
new IonicComponent(Slides, { new IonicComponent_OLD(Slides, {
}); });
@Component({ @Component({
@ -515,7 +515,7 @@ export class Slide {
} }
} }
new IonicComponent(Slide, { new IonicComponent_OLD(Slide, {
}); });
@Component({ @Component({
@ -543,7 +543,7 @@ export class SlidePager {
return this.slides.slides; return this.slides.slides;
} }
} }
new IonicComponent(SlidePager, { new IonicComponent_OLD(SlidePager, {
}); });

View File

@ -4,7 +4,7 @@ import {View} from 'angular2/src/core/annotations_impl/view';
import {ControlGroup, ControlDirective} from 'angular2/forms' import {ControlGroup, ControlDirective} from 'angular2/forms'
import {dom} from 'ionic/util'; import {dom} from 'ionic/util';
import {IonicComponent} from 'ionic/config/component' import {IonicComponent_OLD} from 'ionic/config/component'
@Component({ @Component({
selector: 'ion-switch', selector: 'ion-switch',
@ -90,4 +90,4 @@ export class Switch {
} }
} }
new IonicComponent(Switch, {}) new IonicComponent_OLD(Switch, {})

View File

@ -11,10 +11,10 @@ import {ViewController} from '../view/view-controller';
import {ViewItem} from '../view/view-item'; import {ViewItem} from '../view/view-item';
import {TabButton} from './tab-button'; import {TabButton} from './tab-button';
import {Icon} from '../icon/icon'; import {Icon} from '../icon/icon';
import {IonicComponentNEW} from '../../config/component'; import {IonicComponent} from '../../config/component';
@IonicComponentNEW(Tabs) @IonicComponent(Tabs)
@View({ @View({
template: ` template: `
<nav class="navbar-container tab-bar-container"> <nav class="navbar-container tab-bar-container">

View File

@ -19,7 +19,7 @@ export class IonicDirective extends Directive {
} }
} }
export class IonicComponentNEW extends Component { export class IonicComponent extends Component {
constructor(ComponentType) { constructor(ComponentType) {
super( appendModeConfig(ComponentType) ); super( appendModeConfig(ComponentType) );
} }
@ -86,7 +86,7 @@ function appendModeConfig(ComponentType) {
return config; return config;
} }
export class IonicComponent { export class IonicComponent_OLD {
constructor(ComponentType, { constructor(ComponentType, {
properties, properties,
bind, bind,