chore(): remove use of @View

This commit is contained in:
Adam Bradley
2015-10-09 09:15:02 -05:00
parent 9255d473f1
commit 0cac4d9a2e
27 changed files with 134 additions and 337 deletions

View File

@ -1,4 +1,4 @@
import {Component, Directive, View, NgIf, NgFor, NgClass, ElementRef} from 'angular2/angular2'; import {Component, Directive, NgIf, NgFor, NgClass, ElementRef} from 'angular2/angular2';
import {FormBuilder, Control, ControlGroup, Validators, FORM_DIRECTIVES} from 'angular2/angular2'; import {FormBuilder, Control, ControlGroup, Validators, FORM_DIRECTIVES} from 'angular2/angular2';
import {App, IonicView, Animation, Content, Scroll, Modal, NavController, NavParams} from 'ionic/ionic'; import {App, IonicView, Animation, Content, Scroll, Modal, NavController, NavParams} from 'ionic/ionic';
@ -58,9 +58,7 @@ let WEATHER_ICONS = {
selector: 'weather-icon', selector: 'weather-icon',
inputs: [ inputs: [
'icon' 'icon'
] ],
})
@View({
template: '<i class="icon" [ng-class]="weatherIcon"></i>', template: '<i class="icon" [ng-class]="weatherIcon"></i>',
directives: [NgClass] directives: [NgClass]
}) })
@ -82,9 +80,7 @@ export class WeatherIcon {
selector: 'current-time', selector: 'current-time',
inputs: [ inputs: [
'localtz' 'localtz'
] ],
})
@View({
template: '<span class="current-time">{{currentTime}}</span>', template: '<span class="current-time">{{currentTime}}</span>',
}) })
export class CurrentTime { export class CurrentTime {
@ -102,9 +98,7 @@ export class CurrentTime {
selector: 'current-weather', selector: 'current-weather',
inputs: [ inputs: [
'current' 'current'
] ],
})
@View({
templateUrl: 'current-weather.html', templateUrl: 'current-weather.html',
directives: [NgIf] directives: [NgIf]
}) })
@ -177,9 +171,7 @@ export class CurrentWeather {
selector: 'background-cycler', selector: 'background-cycler',
inputs: [ inputs: [
'image' 'image'
] ],
})
@View({
template: '<div class="bg-image"></div>' template: '<div class="bg-image"></div>'
}) })
export class BackgroundCycler { export class BackgroundCycler {

View File

@ -6,7 +6,7 @@
* The ActionSheet is a modal menu with options to select based on an action. * The ActionSheet is a modal menu with options to select based on an action.
*/ */
import {Component, View, Injectable, NgFor, NgIf} from 'angular2/angular2'; import {Component, Injectable, NgFor, NgIf} from 'angular2/angular2';
import {OverlayController} from '../overlay/overlay-controller'; import {OverlayController} from '../overlay/overlay-controller';
import {IonicConfig} from '../../config/config'; import {IonicConfig} from '../../config/config';
@ -54,9 +54,7 @@ import * as util from 'ionic/util';
* ``` * ```
*/ */
@Component({ @Component({
selector: 'ion-action-sheet' selector: 'ion-action-sheet',
})
@View({
template: template:
'<backdrop (click)="_cancel()" tappable disable-activated></backdrop>' + '<backdrop (click)="_cancel()" tappable disable-activated></backdrop>' +
'<action-sheet-wrapper>' + '<action-sheet-wrapper>' +

View File

@ -1,4 +1,4 @@
import {Component, View, Directive, Optional, NgControl, ElementRef, Renderer} from 'angular2/angular2'; import {Component, Directive, Optional, NgControl, ElementRef, Renderer} from 'angular2/angular2';
import {Ion} from '../ion'; import {Ion} from '../ion';
import {IonicForm} from '../form/form'; import {IonicForm} from '../form/form';
@ -31,9 +31,7 @@ import {IonicForm} from '../form/form';
'[attr.aria-disabled]': 'disabled', '[attr.aria-disabled]': 'disabled',
'[attr.aria-labelledby]': 'labelId', '[attr.aria-labelledby]': 'labelId',
'(click)': 'click($event)' '(click)': 'click($event)'
} },
})
@View({
template: template:
'<media-checkbox disable-activated>' + '<media-checkbox disable-activated>' +
'<checkbox-icon></checkbox-icon>' + '<checkbox-icon></checkbox-icon>' +

View File

@ -1,4 +1,4 @@
import {Component, View, ElementRef, Optional, Host} from 'angular2/angular2'; import {Component, ElementRef, Optional} from 'angular2/angular2';
import {Ion} from '../ion'; import {Ion} from '../ion';
import {IonicConfig} from '../../config/config'; import {IonicConfig} from '../../config/config';
@ -25,11 +25,7 @@ import {ScrollTo} from '../../animations/scroll-to';
*/ */
@Component({ @Component({
selector: 'ion-content', selector: 'ion-content',
inputs: [ inputs: ['parallax'],
'parallax'
]
})
@View({
template: '<scroll-content><ng-content></ng-content></scroll-content>' template: '<scroll-content><ng-content></ng-content></scroll-content>'
}) })
export class Content extends Ion { export class Content extends Ion {

View File

@ -1,4 +1,4 @@
import {Component, Directive, View, ElementRef, NgIf, Host, Optional, Renderer} from 'angular2/angular2'; import {Component, Directive, ElementRef, NgIf, Host, Optional, Renderer} from 'angular2/angular2';
import {Gesture} from 'ionic/gestures/gesture'; import {Gesture} from 'ionic/gestures/gesture';
import {DragGesture} from 'ionic/gestures/drag-gesture'; import {DragGesture} from 'ionic/gestures/drag-gesture';
@ -32,9 +32,7 @@ import {CSS, raf} from 'ionic/util/dom';
selector: 'ion-item-sliding,[ion-item-sliding]', selector: 'ion-item-sliding,[ion-item-sliding]',
inputs: [ inputs: [
'sliding' 'sliding'
] ],
})
@View({
template: template:
'<ng-content select="ion-item-options"></ng-content>' + '<ng-content select="ion-item-options"></ng-content>' +
'<ion-item-sliding-content>' + '<ion-item-sliding-content>' +

View File

@ -1,4 +1,4 @@
import {Component, View, ElementRef, Renderer} from 'angular2/angular2'; import {Component, ElementRef, Renderer} from 'angular2/angular2';
/** /**
@ -18,9 +18,7 @@ import {Component, View, ElementRef, Renderer} from 'angular2/angular2';
* ``` * ```
*/ */
@Component({ @Component({
selector: 'ion-item,[ion-item]' selector: 'ion-item,[ion-item]',
})
@View({
template: template:
'<ng-content select="[item-left]"></ng-content>' + '<ng-content select="[item-left]"></ng-content>' +
'<ng-content select="[item-right]"></ng-content>' + '<ng-content select="[item-right]"></ng-content>' +

View File

@ -1,4 +1,4 @@
import {forwardRef, Directive, Host, View, EventEmitter, ElementRef} from 'angular2/angular2'; import {forwardRef, Directive, Host, EventEmitter, ElementRef} from 'angular2/angular2';
import {Ion} from '../ion'; import {Ion} from '../ion';
import {IonicApp} from '../app/app'; import {IonicApp} from '../app/app';
@ -54,12 +54,10 @@ import * as gestures from './menu-gestures';
'side': 'left', 'side': 'left',
'type': 'reveal' 'type': 'reveal'
}, },
outputs: ['opening'],
host: { host: {
'role': 'navigation' 'role': 'navigation'
}, },
outputs: ['opening']
})
@View({
template: '<ng-content></ng-content><backdrop tappable disable-activated></backdrop>', template: '<ng-content></ng-content><backdrop tappable disable-activated></backdrop>',
directives: [forwardRef(() => MenuBackdrop)] directives: [forwardRef(() => MenuBackdrop)]
}) })

View File

@ -1,4 +1,4 @@
import {Component, Directive, View, Optional, ElementRef, Renderer, TemplateRef, forwardRef, Inject} from 'angular2/angular2'; import {Component, Directive, Optional, ElementRef, Renderer, TemplateRef, forwardRef, Inject} from 'angular2/angular2';
import {Ion} from '../ion'; import {Ion} from '../ion';
import {Icon} from '../icon/icon'; import {Icon} from '../icon/icon';
@ -50,9 +50,7 @@ class BackButtonText extends Ion {
@Component({ @Component({
selector: 'ion-navbar' selector: 'ion-navbar',
})
@View({
template: template:
'<div class="toolbar-inner">' + '<div class="toolbar-inner">' +
'<button class="back-button">' + '<button class="back-button">' +

View File

@ -1,4 +1,4 @@
import {Component, Directive, View, ElementRef, Host, Optional, forwardRef, Inject, NgZone, Compiler, AppViewManager, DynamicComponentLoader, Renderer, ViewContainerRef} from 'angular2/angular2'; import {Component, Directive, ElementRef, Host, Optional, forwardRef, Inject, NgZone, Compiler, AppViewManager, DynamicComponentLoader, Renderer, ViewContainerRef} from 'angular2/angular2';
import {IonicApp} from '../app/app'; import {IonicApp} from '../app/app';
import {IonicConfig} from '../../config/config'; import {IonicConfig} from '../../config/config';
@ -129,9 +129,7 @@ import {NavController} from './nav-controller';
], ],
defaultInputs: { defaultInputs: {
'swipeBackEnabled': true 'swipeBackEnabled': true
} },
})
@View({
template: '<template pane-anchor></template>', template: '<template pane-anchor></template>',
directives: [forwardRef(() => NavPaneAnchor)] directives: [forwardRef(() => NavPaneAnchor)]
}) })
@ -405,9 +403,7 @@ class ContentAnchor {
* @private * @private
*/ */
@Component({ @Component({
selector: 'ion-pane' selector: 'ion-pane',
})
@View({
template: template:
'<section class="navbar-container">' + '<section class="navbar-container">' +
'<template navbar-anchor></template>' + '<template navbar-anchor></template>' +

View File

@ -1,143 +0,0 @@
import {
Directive,
Component,
View,
bootstrap,
Injectable,
Inject,
forwardRef,
Inject,
DynamicComponentLoader,
ElementRef,
Query,
QueryList,
ComponentRef
} from 'angular2/angular2';
@Injectable()
class IonicModal {
constructor() {
console.log('IonicModal constructor');
}
open(componentType) {
console.log('IonicModal open:', componentType.name);
}
}
@Injectable()
class UserService {
constructor() {
console.log('UserService constructor');
this.id = Math.random();
}
}
@Directive({
selector: 'button',
host: {
'ionic-button': 'true'
}
})
class IonicButton {
constructor() {
console.log('IonicButton')
}
}
@Directive({
selector: 'button',
host: {
'user-button': 'true'
}
})
class UserButton {
constructor() {
console.log('UserButton')
}
}
var IONIC_DIRECTIVES = [IonicButton];
@Component({
selector: 'user-modal'
})
@View({
template: `
<div style="position:absolute;top:0;right:0;bottom:0;left:0;background:#ddd;">
<h2>user modal</h2>
<p>UserService: {{userService.id}}
</div>
`
})
class UserModal {
constructor(userService: UserService) {
console.log('UserModal constructor');
this.userService = userService;
}
}
@Component({
selector: 'user-app',
hostInjector: [UserService]
})
@View({
template: `
<h1>user root component</h1>
<button (click)="openModal()">Open Modal</button>
<ng-content></ng-content>
`,
directives: IONIC_DIRECTIVES.concat([UserButton])
})
class UserRootComponent {
constructor(ionicModal: IonicModal, userService: UserService) {
console.log('UserRootComponent constructor');
this.ionicModal = ionicModal;
}
openModal(){
this.ionicModal.open(UserModal);
}
}
@Directive({
selector: 'overlay-anchor'
})
class OverlayAnchor {
constructor(
userService: UserService,
public elementRef: ElementRef,
loader: DynamicComponentLoader)
{
console.log('OverlayAnchor constructor', userService);
loader.loadNextToLocation(UserModal, elementRef).then((ref: ComponentRef) => {
});
}
}
function ionicApp(userApp: Type) {
function IonicRootComponent() {}
IonicRootComponent.annotations = [
new Component({
selector: 'ion-app',
viewInjector: [IonicModal]
}),
new View({
template: `
<user-app>
<overlay-anchor></overlay-anchor>
</user-app>`,
directives: [userApp, OverlayAnchor]
})
];
return IonicRootComponent;
}
console.log('bootstrap')
bootstrap(ionicApp(UserRootComponent)).catch(err => {
console.error('bootstrap', err);
});

View File

@ -1,4 +1,4 @@
import {Component, View, NgZone, Injectable, Renderer} from 'angular2/angular2'; import {Component, NgZone, Injectable, Renderer} from 'angular2/angular2';
import {IonicApp} from '../app/app'; import {IonicApp} from '../app/app';
import {Animation} from '../../animations/animation'; import {Animation} from '../../animations/animation';

View File

@ -1,12 +1,10 @@
import {Component, View, ElementRef, DynamicComponentLoader} from 'angular2/angular2'; import {Component, ElementRef, DynamicComponentLoader} from 'angular2/angular2';
import {OverlayController} from './overlay-controller'; import {OverlayController} from './overlay-controller';
@Component({ @Component({
selector: 'ion-overlay' selector: 'ion-overlay',
})
@View({
template: '' template: ''
}) })
export class OverlayAnchor { export class OverlayAnchor {

View File

@ -1,5 +1,5 @@
import {FORM_DIRECTIVES, NgControl, NgControlGroup, import {FORM_DIRECTIVES, NgControl, NgControlGroup,
Component, View, ElementRef, Injectable, NgClass, NgIf, NgFor} from 'angular2/angular2'; Component, ElementRef, Injectable, NgClass, NgIf, NgFor} from 'angular2/angular2';
import {OverlayController} from '../overlay/overlay-controller'; import {OverlayController} from '../overlay/overlay-controller';
import {IonicConfig} from '../../config/config'; import {IonicConfig} from '../../config/config';
@ -265,11 +265,9 @@ export class Popup {
const OVERLAY_TYPE = 'popup'; const OVERLAY_TYPE = 'popup';
@Component({
selector: 'ion-popup'
})
// TODO add button type to button: [type]="button.type" // TODO add button type to button: [type]="button.type"
@View({ @Component({
selector: 'ion-popup',
template: template:
'<backdrop (click)="_cancel($event)" tappable disable-activated></backdrop>' + '<backdrop (click)="_cancel($event)" tappable disable-activated></backdrop>' +
'<popup-wrapper [ng-class]="cssClass">' + '<popup-wrapper [ng-class]="cssClass">' +

View File

@ -1,4 +1,4 @@
import {Component, Directive, ElementRef, Renderer, Host, Optional, NgControl, Query, QueryList, View} from 'angular2/angular2'; import {Component, Directive, ElementRef, Renderer, Host, Optional, NgControl, Query, QueryList} from 'angular2/angular2';
import {IonicConfig} from '../../config/config'; import {IonicConfig} from '../../config/config';
import {Ion} from '../ion'; import {Ion} from '../ion';
@ -180,9 +180,7 @@ export class RadioGroup extends Ion {
'[attr.aria-disabled]': 'disabled', '[attr.aria-disabled]': 'disabled',
'[attr.aria-labelledby]': 'labelId', '[attr.aria-labelledby]': 'labelId',
'(click)': 'click($event)' '(click)': 'click($event)'
} },
})
@View({
template: template:
'<ion-item-content id="{{labelId}}">' + '<ion-item-content id="{{labelId}}">' +
'<ng-content></ng-content>' + '<ng-content></ng-content>' +

View File

@ -1,10 +1,10 @@
import {Component, View, NgIf, NgClass, ElementRef, EventEmitter, Host} from 'angular2/angular2' import {Component, NgIf, NgClass, ElementRef, EventEmitter, Host} from 'angular2/angular2'
import {Content} from '../content/content'; import {Content} from '../content/content';
import * as util from 'ionic/util'; import * as util from 'ionic/util';
import {raf, ready, CSS} from 'ionic/util/dom'; import {raf, ready, CSS} from 'ionic/util/dom';
/** /**
* Allows you to add pull-to-refresh to an Content component. * Allows you to add pull-to-refresh to an Content component.
* *
@ -50,20 +50,18 @@ import {raf, ready, CSS} from 'ionic/util/dom';
'[class.active]': 'isActive', '[class.active]': 'isActive',
'[class.refreshing]': 'isRefreshing', '[class.refreshing]': 'isRefreshing',
'[class.refreshingTail]': 'isRefreshingTail' '[class.refreshingTail]': 'isRefreshingTail'
} },
}) template:
@View({ '<div class="refresher-content" [class.refresher-with-text]="pullingText || refreshingText">' +
template: `<div class="refresher-content" [class.refresher-with-text]="pullingText || refreshingText"> '<div class="icon-pulling">' +
<div class="icon-pulling"> '<i class="icon" [ng-class]="pullingIcon"></i>' +
<i class="icon" [ng-class]="pullingIcon"></i> '</div>' +
</div> '<div class="text-pulling" [inner-html]="pullingText" *ng-if="pullingText"></div>' +
<div class="text-pulling" [inner-html]="pullingText" *ng-if="pullingText"></div> '<div class="icon-refreshing">' +
<div class="icon-refreshing"> '<i class="icon" [ng-class]="refreshingIcon"></i>' +
<!--<ion-spinner ng-if="showSpinner" icon="{{spinner}}"></ion-spinner>--> '</div>' +
<i class="icon" [ng-class]="refreshingIcon"></i> '<div class="text-refreshing" [inner-html]="refreshingText" *ng-if="refreshingText"></div>' +
</div> '</div>',
<div class="text-refreshing" [inner-html]="refreshingText" *ng-if="refreshingText"></div>
</div>`,
directives: [NgIf, NgClass] directives: [NgIf, NgClass]
}) })
export class Refresher { export class Refresher {

View File

@ -1,4 +1,4 @@
import {Component, View, ElementRef, onInit} from 'angular2/angular2'; import {Component, ElementRef, onInit} from 'angular2/angular2';
import {Ion} from '../ion'; import {Ion} from '../ion';
import {IonicConfig} from '../../config/config'; import {IonicConfig} from '../../config/config';
@ -21,9 +21,12 @@ import * as util from 'ionic/util';
'[class.scroll-x]': 'scrollX', '[class.scroll-x]': 'scrollX',
'[class.scroll-y]': 'scrollY' '[class.scroll-y]': 'scrollY'
}, },
}) template:
@View({ '<scroll-content>' +
template: '<scroll-content><div class="scroll-zoom-wrapper"><ng-content></ng-content></div></scroll-content>' '<div class="scroll-zoom-wrapper">' +
'<ng-content></ng-content>' +
'</div>' +
'</scroll-content>'
}) })
export class Scroll extends Ion { export class Scroll extends Ion {
/** /**

View File

@ -1,4 +1,4 @@
import {ElementRef, Pipe, NgControl, Renderer, View, FORM_DIRECTIVES, NgIf, NgClass} from 'angular2/angular2'; import {ElementRef, Pipe, NgControl, Renderer, FORM_DIRECTIVES, NgIf, NgClass} from 'angular2/angular2';
import {Ion} from '../ion'; import {Ion} from '../ion';
import {IonicConfig} from '../../config/config'; import {IonicConfig} from '../../config/config';
@ -33,17 +33,15 @@ import {ConfigComponent} from '../../config/decorators';
this.element = this.elementRef.nativeElement.querySelector('input'); this.element = this.elementRef.nativeElement.querySelector('input');
this.element.blur(); this.element.blur();
} }
} },
}) template:
@View({ '<div class="search-bar-input-container" [class.left-align]="shouldLeftAlign">' +
template: ` '<div class="search-bar-search-icon"></div>' +
<div class="search-bar-input-container" [class.left-align]="shouldLeftAlign"> '<input (focus)="inputFocused()" (blur)="inputBlurred()" ' +
<div class="search-bar-search-icon"></div> '(input)="inputChanged($event)" class="search-bar-input" type="search" [attr.placeholder]="placeholder" [(ng-model)]="value">' +
<input (focus)="inputFocused()" (blur)="inputBlurred()" '<div class="search-bar-close-icon" (click)="clearInput()"></div>' +
(input)="inputChanged($event)" class="search-bar-input" type="search" [attr.placeholder]="placeholder" [(ng-model)]="value"> '</div>' +
<div class="search-bar-close-icon" (click)="clearInput()"></div> '<button *ng-if="showCancel" (click)="cancelAction()" class="search-bar-cancel" [class.left-align]="shouldLeftAlign">{{cancelText}}</button>',
</div>
<button *ng-if="showCancel" (click)="cancelAction()" class="search-bar-cancel" [class.left-align]="shouldLeftAlign">{{cancelText}}</button>`,
directives: [FORM_DIRECTIVES, NgIf, NgClass] directives: [FORM_DIRECTIVES, NgIf, NgClass]
}) })

View File

@ -1,4 +1,4 @@
it('should animate focus', function() { it('should animate focus', function() {
element(by.css('.e2eFloatingSearchBar input')).sendKeys("Should animate"); element(by.css('.e2eFloatingSearchBar input')).sendKeys("A");
}); });

View File

@ -1,4 +1,4 @@
import {Component, Directive, View, Renderer, ElementRef, EventEmitter, Host, forwardRef, Optional} from 'angular2/angular2'; import {Component, Directive, Renderer, ElementRef, EventEmitter, Host, forwardRef, Optional} from 'angular2/angular2';
import {Control, NgControl, NgFormControl, ControlGroup, ControlDirective} from 'angular2/angular2'; import {Control, NgControl, NgFormControl, ControlGroup, ControlDirective} from 'angular2/angular2';
import {Ion} from '../ion'; import {Ion} from '../ion';
@ -25,9 +25,7 @@ import {dom} from 'ionic/util';
'[class.ng-valid]': 'cd.control?.valid == true', '[class.ng-valid]': 'cd.control?.valid == true',
'[class.ng-invalid]': 'cd.control?.valid == false' '[class.ng-invalid]': 'cd.control?.valid == false'
*/ */
} },
})
@View({
template: '<div class="ion-segment"><ng-content></ng-content></div>', template: '<div class="ion-segment"><ng-content></ng-content></div>',
directives: [forwardRef(() => SegmentButton)] directives: [forwardRef(() => SegmentButton)]
}) })

View File

@ -1,4 +1,4 @@
import {Directive, Component, View, ElementRef, Host, NgIf, NgClass} from 'angular2/angular2'; import {Directive, Component, ElementRef, Host, NgClass} from 'angular2/angular2';
import {Ion} from '../ion'; import {Ion} from '../ion';
import {Animation} from 'ionic/animations/animation'; import {Animation} from 'ionic/animations/animation';
@ -39,16 +39,15 @@ import {Scroll} from '../scroll/scroll';
'zoom', 'zoom',
'zoomDuration', 'zoomDuration',
'zoomMax' 'zoomMax'
] ],
}) template:
@View({ '<div class="swiper-container">' +
template: `<div class="swiper-container"> '<div class="swiper-wrapper">' +
<div class="swiper-wrapper"> '<ng-content></ng-content>' +
<ng-content></ng-content> '</div>' +
</div> '<div [class.hide]="!showPager" class="swiper-pagination"></div>' +
<div [class.hide]="!showPager" class="swiper-pagination"></div> '</div>',
</div>`, directives: [NgClass]
directives: [NgIf, NgClass]
}) })
export class Slides extends Ion { export class Slides extends Ion {
@ -448,10 +447,8 @@ export class Slides extends Ion {
*/ */
@Component({ @Component({
selector: 'ion-slide', selector: 'ion-slide',
inputs: ['zoom'] inputs: ['zoom'],
}) template: '<div class="slide-zoom"><ng-content></ng-content></div>'
@View({
template: `<div class="slide-zoom"><ng-content></ng-content></div>`
}) })
export class Slide { export class Slide {
/** /**

View File

@ -1,15 +1,4 @@
import { import {Component, Directive, ElementRef, Renderer, Host, Optional, NgControl, Inject, forwardRef} from 'angular2/angular2';
Component,
View,
Directive,
ElementRef,
Renderer,
Host,
Optional,
NgControl,
Inject,
forwardRef
} from 'angular2/angular2';
import {IonicForm} from '../form/form'; import {IonicForm} from '../form/form';
import {IonicConfig} from '../../config/config'; import {IonicConfig} from '../../config/config';
@ -95,9 +84,7 @@ class MediaSwitch {
'(mousedown)': 'pointerDown($event)', '(mousedown)': 'pointerDown($event)',
'(touchend)': 'pointerUp($event)', '(touchend)': 'pointerUp($event)',
'(mouseup)': 'pointerUp($event)' '(mouseup)': 'pointerUp($event)'
} },
})
@View({
template: template:
'<ng-content select="[item-left]"></ng-content>' + '<ng-content select="[item-left]"></ng-content>' +
'<ion-item-content id="{{labelId}}">' + '<ion-item-content id="{{labelId}}">' +

View File

@ -1,4 +1,4 @@
import {Directive, Component, View, Host, ElementRef, Compiler, DynamicComponentLoader, AppViewManager, forwardRef, Injector, NgZone, ViewContainerRef} from 'angular2/angular2'; import {Directive, Component, Host, ElementRef, Compiler, DynamicComponentLoader, AppViewManager, forwardRef, Injector, NgZone, ViewContainerRef} from 'angular2/angular2';
import {IonicApp} from '../app/app'; import {IonicApp} from '../app/app';
import {IonicConfig} from '../../config/config'; import {IonicConfig} from '../../config/config';
@ -63,9 +63,7 @@ import {Tabs} from './tabs';
'[attr.aria-labelledby]': 'labeledBy', '[attr.aria-labelledby]': 'labeledBy',
'[attr.aria-hidden]': 'isNotSelected', '[attr.aria-hidden]': 'isNotSelected',
'role': 'tabpanel' 'role': 'tabpanel'
} },
})
@View({
template: '<template content-anchor></template><ng-content></ng-content>', template: '<template content-anchor></template><ng-content></ng-content>',
directives: [forwardRef(() => TabContentAnchor)] directives: [forwardRef(() => TabContentAnchor)]
}) })

View File

@ -1,4 +1,4 @@
import {Component, Directive, View, Injector, ElementRef, Compiler, DynamicComponentLoader, AppViewManager, NgZone, Optional, Host, NgFor, forwardRef, ViewContainerRef} from 'angular2/angular2'; import {Component, Directive, Injector, ElementRef, Compiler, DynamicComponentLoader, AppViewManager, NgZone, Optional, Host, NgFor, forwardRef, ViewContainerRef} from 'angular2/angular2';
import {Ion} from '../ion'; import {Ion} from '../ion';
import {IonicApp} from '../app/app'; import {IonicApp} from '../app/app';
@ -65,9 +65,7 @@ import * as dom from 'ionic/util/dom';
defaultInputs: { defaultInputs: {
'tabBarPlacement': 'bottom', 'tabBarPlacement': 'bottom',
'tabBarIcons': 'top' 'tabBarIcons': 'top'
} },
})
@View({
template: template:
'<section class="navbar-container">' + '<section class="navbar-container">' +
'<template navbar-anchor></template>' + '<template navbar-anchor></template>' +

View File

@ -1,4 +1,4 @@
import {Directive, View, Host, Optional, ElementRef, Renderer, Attribute, Query, QueryList, NgZone} from 'angular2/angular2'; import {Directive, Host, Optional, ElementRef, Renderer, Attribute, Query, QueryList, NgZone} from 'angular2/angular2';
import {IonicConfig} from '../../config/config'; import {IonicConfig} from '../../config/config';
import {IonicForm} from '../form/form'; import {IonicForm} from '../form/form';

View File

@ -1,4 +1,4 @@
import {Component, Directive, View, Host, ElementRef, Renderer, Optional, forwardRef, Inject} from 'angular2/angular2'; import {Component, Directive, Host, ElementRef, Renderer, Optional, forwardRef, Inject} from 'angular2/angular2';
import {Ion} from '../ion'; import {Ion} from '../ion';
import {IonicConfig} from '../../config/config'; import {IonicConfig} from '../../config/config';
@ -56,9 +56,7 @@ export class ToolbarBase extends Ion {
* TODO * TODO
*/ */
@Component({ @Component({
selector: 'ion-toolbar' selector: 'ion-toolbar',
})
@View({
template: template:
'<div class="toolbar-inner">' + '<div class="toolbar-inner">' +
'<ng-content select="[menu-toggle]"></ng-content>' + '<ng-content select="[menu-toggle]"></ng-content>' +
@ -82,9 +80,7 @@ export class Toolbar extends ToolbarBase {
@Component({ @Component({
selector: 'ion-title' selector: 'ion-title',
})
@View({
template: template:
'<div class="toolbar-title">' + '<div class="toolbar-title">' +
'<ng-content></ng-content>' + '<ng-content></ng-content>' +

View File

@ -29,8 +29,9 @@ class PageImpl extends View {
* *
* ```ts * ```ts
* @Page({ * @Page({
* template: '<ion-checkbox my-custom-dir>' + * template: `
* '</ion-checkbox>' * <ion-checkbox my-custom-dir>
* </ion-checkbox>`
* directives: [MyCustomDirective] * directives: [MyCustomDirective]
* }) * })
* class MyPage {} * class MyPage {}
@ -45,11 +46,10 @@ class PageImpl extends View {
* ```ts * ```ts
* import {IONIC_DIRECTIVES} from 'ionic/ionic'; * import {IONIC_DIRECTIVES} from 'ionic/ionic';
* @Component({ * @Component({
* template: `<div class="customStyle"> * selector: 'my-component'
* template: `<div class="my-style">
* <ion-checkbox></ion-checkbox> * <ion-checkbox></ion-checkbox>
* </div>` * </div>`,
* })
* @View({
* directives: [IONIC_DIRECTIVES] * directives: [IONIC_DIRECTIVES]
* }) * })
* class MyCustomCheckbox {} * class MyCustomCheckbox {}
@ -60,7 +60,8 @@ class PageImpl extends View {
* ``` * ```
* along with any other components and add them individually: * along with any other components and add them individually:
* ``` * ```
* @View({ * @Component({
* ...
* directives: [Checkbox, Icon] * directives: [Checkbox, Icon]
* }) * })
* ``` * ```

View File

@ -11,7 +11,7 @@ exports.config = {
specs: 'dist/e2e/**/*e2e.js', specs: 'dist/e2e/**/*e2e.js',
//specs: 'dist/e2e/tabs/**/*e2e.js', //specs: 'dist/e2e/tabs/**/*e2e.js',
sleepBetweenSpecs: 1000, sleepBetweenSpecs: 900,
platformDefauls: { platformDefauls: {
browser: 'chrome', browser: 'chrome',