From 63b5b19e1206d0f377237d2fa4fd54d17cda9436 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@drifty.com>
Date: Tue, 23 Jun 2015 17:04:54 -0500
Subject: [PATCH] decorator lyfe

---
 ionic/components/checkbox/checkbox.js |  7 +++----
 ionic/config/component.js             | 14 ++++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ionic/components/checkbox/checkbox.js b/ionic/components/checkbox/checkbox.js
index fd33c3c932..7b5f17f1cf 100644
--- a/ionic/components/checkbox/checkbox.js
+++ b/ionic/components/checkbox/checkbox.js
@@ -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/src/core/annotations_impl/annotations';
-import {Ancestor} from 'angular2/src/core/annotations_impl/visibility';
-import {View} from 'angular2/src/core/annotations_impl/view';
+import {Component, Directive} from 'angular2/angular2';
+import {Ancestor} from 'angular2/angular2';
+import {View} from 'angular2/angular2';
 import {onInit} from 'angular2/angular2';
 
 //pretty sure this has changed in the latest angular
@@ -12,7 +12,6 @@ import {NgControl} from 'angular2/forms';
 import {IonicComponent} from '../../config/component';
 import {Icon} from '../icon/icon';
 
-
 @IonicComponent(Checkbox)
 @View({
   template: `
diff --git a/ionic/config/component.js b/ionic/config/component.js
index 0c472ac3d8..a887bcb768 100644
--- a/ionic/config/component.js
+++ b/ionic/config/component.js
@@ -1,4 +1,4 @@
-import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
+import {Component, ComponentAnnotation, Directive} from 'angular2/angular2';
 import {DirectiveMetadata} from 'angular2/src/render/api';
 
 import * as util from 'ionic/util';
@@ -6,18 +6,20 @@ import {Platform} from 'ionic/platform/platform';
 
 const platformMode = Platform.getMode();
 
-
 export class IonicDirective extends Directive {
   constructor(ComponentType) {
     super( appendModeConfig(ComponentType) );
   }
 }
 
-export class IonicComponent extends Component {
-  constructor(ComponentType) {
-    super( appendModeConfig(ComponentType) );
+export let IonicComponent = (function(){
+  function IonicComponentFactory(ComponentClass) {
+    return new Component(appendModeConfig(ComponentClass));
   }
-}
+  IonicComponentFactory.prototype = Object.create(ComponentAnnotation.prototype);
+  return IonicComponentFactory;
+})();
+
 
 function appendModeConfig(ComponentType) {
   let config = ComponentType.config;