javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 19:57:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "decorator lyfe"

Browse Source 
This reverts commit 63b5b19e1206d0f377237d2fa4fd54d17cda9436.
This commit is contained in:
Adam Bradley
2015-06-25 11:07:04 -05:00
parent 4144f7ac83
commit 4894f84dd4
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ionic/components/checkbox/checkbox.js
View File

@ -2,9 +2,9 @@ import {ElementRef, Renderer, EventEmitter, onChange} from 'angular2/angular2';
import {isPresent} from 'angular2/src/facade/lang';
import {setProperty} from 'angular2/src/forms/directives/shared'
import {Component, Directive} from 'angular2/angular2';
import {Ancestor} from 'angular2/angular2';
import {View} 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 {onInit} from 'angular2/angular2';
//pretty sure this has changed in the latest angular
@ -12,6 +12,7 @@ import {NgControl} from 'angular2/forms';
import {IonicComponent} from '../../config/component';
import {Icon} from '../icon/icon';
@IonicComponent(Checkbox)
@View({
template: `

14
ionic/config/component.js
View File

@ -1,24 +1,22 @@
import {Component, ComponentAnnotation, Directive} from 'angular2/angular2';
import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
import {DirectiveMetadata} from 'angular2/src/render/api';
import * as util from 'ionic/util';
import {Platform} from 'ionic/platform/platform';
import {GlobalIonicConfig} from '../components/app/app';
export class IonicDirective extends Directive {
constructor(ComponentType) {
super( appendModeConfig(ComponentType) );
}
}
export let IonicComponent = (function(){
function IonicComponentFactory(ComponentClass) {
return new Component(appendModeConfig(ComponentClass));
export class IonicComponent extends Component {
constructor(ComponentType) {
super( appendModeConfig(ComponentType) );
}
IonicComponentFactory.prototype = Object.create(ComponentAnnotation.prototype);
return IonicComponentFactory;
})();
}
function appendModeConfig(ComponentType) {
let config = ComponentType.config;