Merge branch 'navbar'
authorRoza Moustafa <roza.92m@hotmail.com>
Thu, 19 Nov 2015 19:08:06 +0000 (20:08 +0100)
committerRoza Moustafa <roza.92m@hotmail.com>
Thu, 19 Nov 2015 19:08:06 +0000 (20:08 +0100)
# Conflicts:
# src/components/app.html
# src/components/map/map.ts
# src/components/search/search.ts

1  2 
src/components/app.html
src/components/search/search.ts

@@@ -1,12 -1,6 +1,6 @@@
  <div class="container">
-     <div class="nav">
-         Navbar
-         <mou-search (newsearch)="map.update($event)"></mou-search>
-         <mou-filter></mou-filter>
-     </div>
+     <mou-navbar></mou-navbar>
 -    <mou-map></mou-map>
 +    <mou-map #map></mou-map>
  </div>
  
  
@@@ -9,17 -8,24 +9,25 @@@ import {LiveSearch} from "./livesearch"
      styleUrls: ['./components/search/search.css']
  })
  export class Search {
-     orgunits:Array<any> = [];
-     loading:boolean = false;
+     orgunits: Array<any> = [];
+     loading: boolean = false;
  
 -    getMoreInfo(orgunit){
 -        console.log(orgunit.id);
 +    constructor() {
 +        this.newsearch = new EventEmitter();
++        this.visible = true;
      }
  
 -    //tester pil oppned
 -
 -    constructor() {
 -        this.visible = true;
 +    getMoreInfo(orgunit) {
 +        this.newsearch.next(orgunit.id);
      }
  
++    //tester pil oppned
++
+     toggle() {
+         this.visible = !this.visible;
+     }
  }