Merge pull request NativeScript#2487 from NativeScript/xhr-text-fix

Alexander Vakrilov · web-flow · commit 66ff58e80a3a · 2016-07-21T17:08:16.000+03:00
Add toString() method on response with type is text
diff --git a/tns-core-modules/utils/types.d.ts b/tns-core-modules/utils/types.d.ts
@@ -19,6 +19,13 @@
      * Returns true if value is a function.
      */
     export function isFunction(value: any): boolean;
+
+    /**
+     * A function that checks if something is an object.
+     * @param value The value which will be checked.
+     * Returns true if value is an object.
+     */
+    export function isObject(value: any): boolean;
     
     /**
      * A function that checks if something is "undefined".
diff --git a/tns-core-modules/utils/types.ts b/tns-core-modules/utils/types.ts
@@ -13,6 +13,13 @@ export function isFunction(value: any): boolean {
     return typeof value === "function";
 }
 
+export function isObject(value: any): boolean {
+    if (!value) {
+        return false;
+    }
+    return typeof value === "object";
+}
+
 export function isUndefined(value: any): boolean {
     return typeof value === "undefined";
 }
diff --git a/tns-core-modules/xhr/xhr.ts b/tns-core-modules/xhr/xhr.ts
@@ -81,7 +81,7 @@ export class XMLHttpRequest {
                 this._options.content = (<FormData>data).toString();
             }
 
-            http.request(this._options).then(r=> {
+            http.request(this._options).then(r => {
                 if (!this._errorFlag) {
                     this._loadResponse(r);
                 }
@@ -104,29 +104,27 @@ export class XMLHttpRequest {
 
         this._setResponseType();
 
-        if (this.responseType === XMLHttpRequestResponseType.json) {
-            this._prepareJsonResponse(r);
+        this._responseTextReader = () => r.content.toString();
+        this._addToStringOnResponse();
 
-        } else if (this.responseType === XMLHttpRequestResponseType.empty ||
-            this.responseType === XMLHttpRequestResponseType.text) {
-            this._responseTextReader = () => r.content.toString();
+        if (this.responseType === XMLHttpRequestResponseType.json) {
+            this._response = JSON.parse(this.responseText);
         }
 
         this._setReadyState(this.DONE);
     }
 
-    private _prepareJsonResponse(r) {
-        this._responseTextReader = () => r.content.toString();
-        this._response = JSON.parse(this.responseText);
-
+    private _addToStringOnResponse() {
         // Add toString() method to ease debugging and
         // make Angular2 response.text() method work properly.
-        Object.defineProperty(this._response, "toString", {
-            configurable: true,
-            enumerable: false,
-            writable: true,
-            value: () => this.responseText
-        });
+        if (types.isObject(this.response)) {
+            Object.defineProperty(this._response, "toString", {
+                configurable: true,
+                enumerable: false,
+                writable: true,
+                value: () => this.responseText
+            });
+        }
     }
 
     private _setResponseType() {
@@ -180,9 +178,9 @@ export class XMLHttpRequest {
             return "";
         }
 
-        var result = "";
+        let result = "";
 
-        for (var i in this._headers) {
+        for (let i in this._headers) {
             // Cookie headers are excluded
             if (i !== "set-cookie" && i !== "set-cookie2") {
                 result += i + ": " + this._headers[i] + "\r\n";
@@ -197,7 +195,7 @@ export class XMLHttpRequest {
             && !this._errorFlag
         ) {
             header = header.toLowerCase();
-            for (var i in this._headers) {
+            for (let i in this._headers) {
                 if (i.toLowerCase() === header) {
                     return this._headers[i];
                 }
@@ -275,7 +273,7 @@ export class XMLHttpRequest {
     }
 }
 
-var statuses = {
+const statuses = {
     100: "Continue",
     101: "Switching Protocols",
     200: "OK",
@@ -330,9 +328,9 @@ export class FormData {
     }
 
     toString(): string {
-        var arr = new Array<string>();
+        let arr = new Array<string>();
 
-        this._data.forEach(function(value, name, map) {
+        this._data.forEach(function (value, name, map) {
             arr.push(`${encodeURIComponent(name)}=${encodeURIComponent(value)}`);
         });
 

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,13 @@ export function isFunction(value: any): boolean {`
`13`	`13`	`return typeof value === "function";`
`14`	`14`	`}`
`15`	`15`
	`16`	`+export function isObject(value: any): boolean {`
	`17`	`+ if (!value) {`
	`18`	`+ return false;`
	`19`	`+ }`
	`20`	`+ return typeof value === "object";`
	`21`	`+}`
	`22`	`+`
`16`	`23`	`export function isUndefined(value: any): boolean {`
`17`	`24`	`return typeof value === "undefined";`
`18`	`25`	`}`