This commit is contained in:
Max Lynch
2015-05-12 14:27:59 -05:00
parent 5042426683
commit c2b4acaced
2 changed files with 13 additions and 7 deletions

View File

@ -1,4 +1,9 @@
import {NgElement, Renderer, ElementRef, Component, DefaultValueAccessor, View, Ancestor, Optional, Decorator, Directive} from 'angular2/angular2' import {ElementRef} from 'angular2/angular2'
import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
import {Ancestor} from 'angular2/src/core/annotations_impl/visibility';
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} from 'ionic/config/component'
@ -29,14 +34,14 @@ import {IonicComponent} from 'ionic/config/component'
}) })
export class Checkbox { export class Checkbox {
constructor( constructor(
@NgElement() ngElement: NgElement, elementRef: ElementRef,
cd: ControlDirective cd: ControlDirective
// @PropertySetter('attr.role') setAriaRole: Function, // @PropertySetter('attr.role') setAriaRole: Function,
// @PropertySetter('attr.aria-checked') setAriaChecked: Function, // @PropertySetter('attr.aria-checked') setAriaChecked: Function,
// @PropertySetter('attr.aria-invalid') setAriaInvalid: Function, // @PropertySetter('attr.aria-invalid') setAriaInvalid: Function,
// @PropertySetter('attr.aria-disabled') setAriaDisabled: Function // @PropertySetter('attr.aria-disabled') setAriaDisabled: Function
) { ) {
this.domElement = ngElement.domElement this.domElement = elementRef.domElement
this.domElement.classList.add('item') this.domElement.classList.add('item')
this.controlDirective = cd; this.controlDirective = cd;
cd.valueAccessor = this; cd.valueAccessor = this;
@ -60,8 +65,8 @@ export class Checkbox {
this.setCheckedProperty = setAriaChecked this.setCheckedProperty = setAriaChecked
// TODO: This is a hack and not a very good one at that // TODO: This is a hack and not a very good one at that
this.domElement.querySelector('.checkbox-off').classList.add(this.config.properties.iconOff.ios); this.domElement.querySelector('.checkbox-off').classList.add(this.config.properties.iconOff.defaults.ios);
this.domElement.querySelector('.checkbox-on').classList.add(this.config.properties.iconOn.ios); this.domElement.querySelector('.checkbox-on').classList.add(this.config.properties.iconOn.defaults.ios);
} }
/** /**

View File

@ -3,12 +3,13 @@ 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 {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms'; import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms';
import {IONIC_DIRECTIVES} from 'ionic/ionic' import {Checkbox, Content, Button, List} from 'ionic/ionic';
//import {IONIC_DIRECTIVES} from 'ionic/ionic'
@Component({ selector: 'ion-app' }) @Component({ selector: 'ion-app' })
@View({ @View({
templateUrl: 'main.html', templateUrl: 'main.html',
directives: [FormDirectives].concat(IONIC_DIRECTIVES) directives: [FormDirectives].concat([Checkbox, List, Content, Button])
}) })
class IonicApp { class IonicApp {
constructor() { constructor() {