Add responseURL property for XMLHttpRequest

facebook · Dec 26, 2015 · 6f6fc33 · 6f6fc33
1 parent 226b36c
commit 6f6fc33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/Libraries/Fetch/fetch.js b/Libraries/Fetch/fetch.js
@@ -278,7 +278,7 @@ var self = {};
     }
     this._initBody(body)
   }
-  
+
   Request.prototype.clone = function() {
     return new Request(this)
   }
@@ -324,7 +324,7 @@ var self = {};
     this.headers = options.headers instanceof Headers ? options.headers : new Headers(options.headers)
     this.url = options.url || ''
   }
-  
+
   Response.prototype.clone = function() {
     return new Response(this._bodyInit, {
       status: this.status,
@@ -352,7 +352,7 @@ var self = {};
       var xhr = new XMLHttpRequest()
 
       function responseURL() {
-        if ('responseURL' in xhr) {
+        if ('responseURL' in xhr && xhr.responseURL) {
           return xhr.responseURL
         }
 

diff --git a/Libraries/Network/XMLHttpRequestBase.js b/Libraries/Network/XMLHttpRequestBase.js
@@ -32,6 +32,7 @@ class XMLHttpRequestBase {
   responseHeaders: ?Object;
   responseText: ?string;
   status: number;
+  responseURL: ?string;
 
   upload: ?{
     onprogress?: (event: Object) => void;
@@ -69,7 +70,7 @@ class XMLHttpRequestBase {
     this.responseHeaders = undefined;
     this.responseText = '';
     this.status = 0;
-    delete this.responseURL;
+    this.responseURL = null;
 
     this._requestId = null;
 
@@ -116,9 +117,7 @@ class XMLHttpRequestBase {
       this.status = status;
       this.setResponseHeaders(responseHeaders);
       this.setReadyState(this.HEADERS_RECEIVED);
-      if (responseURL) {
-        this.responseURL = responseURL;
-      }
+      this.responseURL = responseURL || null;
     }
   }