alpha39 updates/hacks

Conflicts:
	ionic/components/search-bar/search-bar.ts
	ionic/config/decorators.ts

ionic/components.ts

@@ -4,7 +4,6 @@ export * from 'ionic/components/app/id'
 export * from 'ionic/components/action-sheet/action-sheet'
 export * from 'ionic/components/blur/blur'
 export * from 'ionic/components/button/button'
-export * from 'ionic/components/card/card'
 export * from 'ionic/components/checkbox/checkbox'
 export * from 'ionic/components/content/content'
 export * from 'ionic/components/form/input'

ionic/components/card/card.ts

@@ -1,12 +0,0 @@
-import {Directive} from 'angular2/angular2';
-
-/**
- * TODO
- */
-@Directive({
-  selector: 'ion-card',
-  host: {
-    'class': 'card'
-  }
-})
-export class Card {}

ionic/components/item/item.scss

@@ -155,3 +155,9 @@ ion-item-options {
   z-index: $z-index-item-options;
   height: 100%;
 }
+
+
+// TEMP hack for https://github.com/angular/angular/issues/4582
+[item-right] {
+  order: 1;
+}

ionic/components/item/item.ts

@@ -1,4 +1,4 @@
-import {Component, View} from 'angular2/angular2';
+import {Component, View, ElementRef, Renderer} from 'angular2/angular2';
 
 
 /**
@@ -18,17 +18,18 @@ import {Component, View} from 'angular2/angular2';
  *  ```
  */
 @Component({
-  selector: 'ion-item,[ion-item]',
-  host: {
-    'class': 'item'
-  }
+  selector: 'ion-item,[ion-item]'
 })
 @View({
   template:
     '<ng-content select="[item-left]"></ng-content>' +
+    '<ng-content select="[item-right]"></ng-content>' +
     '<ion-item-content>' +
       '<ng-content></ng-content>'+
-    '</ion-item-content>' +
-    '<ng-content select="[item-right]"></ng-content>'
+    '</ion-item-content>'
 })
-export class Item {}
+export class Item {
+  constructor(elementRef: ElementRef, renderer: Renderer) {
+    renderer.setElementClass(elementRef, 'item', true);
+  }
+}

ionic/components/item/modes/ios.scss

@@ -210,7 +210,7 @@ button.item {
 }
 
 .list,
-.card {
+ion-card {
   button[ion-item]:not([detail-none]),
   a[ion-item]:not([detail-none]),
   [detail-push]:not(ion-item-sliding) {

ionic/components/item/modes/md.scss

@@ -148,8 +148,8 @@ $item-md-sliding-transition:         transform 250ms ease-in-out !default;
     margin: 4px;
   }
 
-  icon + ion-item-content,
-  icon + .text-input {
+  icon[item-left] + ion-item-content,
+  icon[item-left] + .text-input {
     margin-left: $item-md-padding-left + ($item-md-padding-left / 2);
   }
 

ionic/components/search-bar/test/basic/index.ts

@@ -1,5 +1,4 @@
-import {NgControl} from 'angular2/angular2';
-import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/forms';
+import {NgControl, FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/angular2';
 
 import {App} from 'ionic/ionic';
 import {SearchPipe} from 'ionic/components/search-bar/search-bar';

ionic/config/directives.ts

@@ -12,7 +12,6 @@ import {Refresher} from '../components/scroll/pull-to-refresh';
 import {Slides, Slide, SlideLazy} from '../components/slides/slides';
 import {Tabs} from '../components/tabs/tabs';
 import {Tab} from '../components/tabs/tab';
-import {Card} from '../components/card/card';
 import {List, ListHeader} from '../components/list/list';
 import {Item} from '../components/item/item';
 import {ItemGroup, ItemGroupTitle} from '../components/item/item-group';
@@ -55,7 +54,6 @@ export const IONIC_DIRECTIVES = [
   Refresher,
 
   // Lists
-  Card,
   List,
   ListHeader,
   Item,