Merge branch 'master' into search

* master:
  Revert "[apiService] created a service for getting the API URL"

# Conflicts:
#	src/components/app.ts
#	src/index.html

diff --git a/src/components/app.ts b/src/components/app.ts
index 1c2894da24e9e2c892c0690b2a49079de4d2190c..7feefc38f80a1b06bdbe8e9e7fba77971b84837a 100644 (file)
--- a/src/components/app.ts
+++ b/src/components/app.ts
@@ -3,7 +3,6 @@ import {Component, View, bootstrap, provide, ELEMENT_PROBE_PROVIDERS} from 'angu
 import {Map} from './map/map';
 import {Search} from "./search/search";
 import {Filter} from "./filter/filter";
-import {DhisapiService} from "./dhisapi/dhisapiService";
 
 declare var System:any;
 
@@ -11,18 +10,12 @@ declare var System:any;
     {
         selector: 'mou-app',
         templateUrl: './components/app.html',
-        directives:[Filter, Map, Search],
-        providers: [DhisapiService]
+        directives:[Filter, Map, Search]
     })
 
 
 class App {
-    constructor(dhis: DhisapiService){
-        dhis.getApiURL(function(uri){
-            console.log(uri);
-        })
-    }
 
 }
 
-bootstrap(App,[HTTP_PROVIDERS, ELEMENT_PROBE_PROVIDERS, DhisapiService]);
+bootstrap(App,[HTTP_PROVIDERS, ELEMENT_PROBE_PROVIDERS]);

diff --git a/src/components/dhisapi/dhisapiService.ts b/src/components/dhisapi/dhisapiService.ts
deleted file mode 100644 (file)
index 38f9c4b..0000000
--- a/src/components/dhisapi/dhisapiService.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import {Injectable} from 'angular2/angular2';
-import {Http} from 'angular2/http';
-
-@Injectable()
-export class DhisapiService {
-    private http: Http;
-
-    constructor(http: Http){
-        this.http = http;
-    }
-
-    getApiURL = function(callback){
-        this.http.get('../manifest.webapp')
-            .map(res => res.json())
-            .map(res => res.activities.dhis.href)
-            .subscribe( res => callback(res));
-    }
-}

diff --git a/src/components/filter/filter.ts b/src/components/filter/filter.ts
index 9181b7995e35123c69d419e45dc5841b954734fe..a3a63b7bd17bf3a0883f40fcfc3467043bd935a6 100644 (file)
--- a/src/components/filter/filter.ts
+++ b/src/components/filter/filter.ts
@@ -1,18 +1,15 @@
 import {Component, View, CORE_DIRECTIVES} from 'angular2/angular2';
 import {Headers, Http} from 'angular2/http';
-import {DhisapiService} from "../dhisapi/dhisapiService";
 
 @Component({
     selector: 'mou-filter',
     directives: [CORE_DIRECTIVES],
-    templateUrl: './components/filter/filter.html',
-    providers: [DhisapiService]
+    templateUrl: './components/filter/filter.html'
 })
 
 export class Filter {
     result: Object;
 
-    dhis: DhisapiService;
     // Example HTTP request
 
     /*
@@ -34,15 +31,4 @@ export class Filter {
     }
 
     */
-
-    constructor(dhis: DhisapiService){
-        this.dhis = dhis;
-    }
-
-    onInit(){
-        this.dhis.getApiURL(function(uri){
-            console.log("Dette er uri: " + uri);
-        })
-    }
-
 }

diff --git a/src/index.html b/src/index.html
index c6d39b05036f48cf4a1d42fc6f24f1512216a5d3..d86b77e4b0d7f3e7e68f2d3004c299a4045d626f 100644 (file)
--- a/src/index.html
+++ b/src/index.html
@@ -6,6 +6,13 @@
 
     <script src="../node_modules/@reactivex/rxjs/dist/global/Rx.js"></script>
 
+    <script>
+        var xhReq = new XMLHttpRequest();
+        xhReq.open("GET", "../manifest.webapp", false);
+        xhReq.send(null);
+        var serverResponse = JSON.parse(xhReq.responseText);
+        var dhisAPI = serverResponse.activities.dhis.href;
+    </script>
     <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDlgw6kZAQvD8ex_md-6wb_NcnVlZWkbE4"></script>
     <script src="../node_modules/systemjs/dist/system.src.js"></script>
     <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>