Merge pull request #2602 from acramatte/xhr-json-syntax-suffix-support

Parse XHR response content type with +json as JSON

tests/app/xhr-tests.ts

@@ -298,7 +298,27 @@ export function test_xhr_responseType_switched_to_JSON_if_header_present() {
             "Content-Type": "application/json"
         }
 
+    };
+    xhr._loadResponse(response);
+
+    TKUnit.assertEqual(xhr.responseType, "json");
+    TKUnit.assertEqual(xhr.response.data, 42);
 }
+
+export function test_xhr_responseType_switched_to_JSON_if_headers_content_type_has_json_suffix() {
+    const xhr = <any>new XMLHttpRequest();
+    const response = {
+        statusCode: 200,
+        content: {
+            toString: function () {
+                return this.raw
+            },
+            raw: '{"data": 42}'
+        },
+        headers: {
+            "Content-Type": "type/media.type+json"
+        }
+    };
     xhr._loadResponse(response);
 
     TKUnit.assertEqual(xhr.responseType, "json");

tns-core-modules/xhr/xhr.ts

@@ -132,7 +132,7 @@ export class XMLHttpRequest {
         const contentType = header && header.toLowerCase();
 
         if (contentType) {
-            if (contentType.indexOf('application/json') >= 0) {
+            if (contentType.indexOf('application/json') >= 0 || contentType.indexOf('+json') >= 0) {
                 this.responseType = XMLHttpRequestResponseType.json;
             } else if (contentType.indexOf('text/plain') >= 0) {
                 this.responseType = XMLHttpRequestResponseType.text;