From d7d6c087b21f8829facefaad436bf32bdf7b2c1c Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 2 Jun 2015 12:25:28 -0500
Subject: [PATCH] Fixed up search bar

---
 ionic/components.js                           |  2 +-
 ionic/components/app/test/sink/index.js       |  4 ++--
 .../app/test/sink/pages/search-bar.js         | 19 ++++++++++++-------
 ionic/components/search-bar/search-bar.js     |  4 ++--
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ionic/components.js b/ionic/components.js
index b1267e49ec..3f9454b7da 100644
--- a/ionic/components.js
+++ b/ionic/components.js
@@ -20,7 +20,7 @@ export * from 'ionic/components/nav/nav-item'
 export * from 'ionic/components/nav-bar/nav-bar'
 export * from 'ionic/components/slides/slides'
 export * from 'ionic/components/radio/radio'
-// export * from 'ionic/components/search-bar/search-bar'
+export * from 'ionic/components/search-bar/search-bar'
 // export * from 'ionic/components/split-view/split-view'
 export * from 'ionic/components/segment/segment'
 export * from 'ionic/components/switch/switch'
diff --git a/ionic/components/app/test/sink/index.js b/ionic/components/app/test/sink/index.js
index 5c5751d067..85c5e04c4a 100644
--- a/ionic/components/app/test/sink/index.js
+++ b/ionic/components/app/test/sink/index.js
@@ -14,7 +14,7 @@ import {ListPage} from './pages/list'
 import {CardPage} from './pages/card'
 import {FormPage} from './pages/form'
 import {SegmentPage} from './pages/segment'
-import {SearchBar} from './pages/search-bar'
+import {SearchBarPage} from './pages/search-bar'
 import {IconsPage} from './pages/ionicons'
 import {TabsPage} from './pages/tabs'
 import {AsidePage} from './pages/aside'
@@ -40,7 +40,7 @@ export class IonicApp {
       { title: 'Cards', component: CardPage },
       { title: 'Forms', component: FormPage },
       { title: 'Segments', component: SegmentPage },
-      { title: 'Search Bar', component: SearchBar},
+      { title: 'Search Bar', component: SearchBarPage },
       { title: 'Icons', component: IconsPage },
       { title: 'Tabs', component: TabsPage },
       { title: 'Aside', component: AsidePage },
diff --git a/ionic/components/app/test/sink/pages/search-bar.js b/ionic/components/app/test/sink/pages/search-bar.js
index f9f16ea1d7..0d00d413f5 100644
--- a/ionic/components/app/test/sink/pages/search-bar.js
+++ b/ionic/components/app/test/sink/pages/search-bar.js
@@ -2,17 +2,19 @@ import {NgFor, DynamicComponentLoader, Injector, DomRenderer, ElementRef} from '
 import {Ancestor} from 'angular2/src/core/annotations_impl/visibility';
 import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
 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 {Segment, SegmentButton, List, Item, ActionMenu, Modal, ModalRef,
+import {Segment, SegmentButton, SearchBar, List, Item, ActionMenu, Modal, ModalRef,
   NavbarTemplate, Navbar, NavController, Button, Content} from 'ionic/ionic';
 
+  console.log(NavbarTemplate, Navbar, Content, formDirectives);
+
 @Component({
   selector: 'ion-view'
 })
 @View({
   template: `
-  <ion-navbar *navbar><ion-title>Cards</ion-title></ion-navbar>
+  <ion-navbar *navbar><ion-title>Search Bar</ion-title></ion-navbar>
 
   <ion-content class="padding">
     <h2>Search Bar</h2>
@@ -25,17 +27,20 @@ import {Segment, SegmentButton, List, Item, ActionMenu, Modal, ModalRef,
     </p>
 
     <form (^submit)="doSubmit($event)" [control-group]="form">
+      <ion-search-bar control="searchQuery"></ion-search-bar>
+      <div>
+        Query: <b>{{form.controls.searchQuery.value}}</b>
+      </div>
     </form>
   </ion-content>
   `,
-  directives: [NavbarTemplate, Navbar, Content, List, Item, Segment, SegmentButton]
+  directives: [formDirectives, NavbarTemplate, Navbar, Content, SearchBar]
 })
-export class SegmentPage {
+export class SearchBarPage {
   constructor() {
     var fb = new FormBuilder();
     this.form = fb.group({
-      mapStyle: ['hybrid', Validators.required]
+      searchQuery: ['', Validators.required]
     });
-
   }
 }
diff --git a/ionic/components/search-bar/search-bar.js b/ionic/components/search-bar/search-bar.js
index de1e89b8a9..1a7a0c4319 100644
--- a/ionic/components/search-bar/search-bar.js
+++ b/ionic/components/search-bar/search-bar.js
@@ -32,8 +32,8 @@ export class SearchBar {
     cd.valueAccessor = this; //ControlDirective should inject CheckboxControlDirective
 
     setTimeout(() => {
-      console.log('Search bar for list', this.list);
-      this.query = 'Cats';
+      //console.log('Search bar for list', this.list);
+      this.query = '';
     })
   }