From 09646854861b5699716300b4ad95cbb51d5ca62e Mon Sep 17 00:00:00 2001 From: Aaron O'Mullan Date: Mon, 27 Sep 2021 11:13:27 +0200 Subject: [PATCH] refactor(fetch/Request): inline defaultInnerRequest (#12241) Similar to #12235 --- ext/fetch/23_request.js | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/ext/fetch/23_request.js b/ext/fetch/23_request.js index dfb7e21271..bf1683b359 100644 --- a/ext/fetch/23_request.js +++ b/ext/fetch/23_request.js @@ -62,18 +62,6 @@ * @property {Blob | null} blobUrlEntry */ - const defaultInnerRequest = { - url() { - return this.urlList[0]; - }, - currentUrl() { - return this.urlList[this.urlList.length - 1]; - }, - redirectMode: "follow", - redirectCount: 0, - clientRid: null, - }; - /** * @param {string} method * @param {string} url @@ -87,12 +75,20 @@ blobUrlEntry = blobFromObjectUrl(url); } return { - method: method, + method, headerList, body, + redirectMode: "follow", + redirectCount: 0, urlList: [url], + clientRid: null, blobUrlEntry, - ...defaultInnerRequest, + url() { + return this.urlList[0]; + }, + currentUrl() { + return this.urlList[this.urlList.length - 1]; + }, }; } @@ -112,12 +108,6 @@ return { method: request.method, - url() { - return this.urlList[0]; - }, - currentUrl() { - return this.urlList[this.urlList.length - 1]; - }, headerList, body, redirectMode: request.redirectMode, @@ -125,6 +115,12 @@ urlList: request.urlList, clientRid: request.clientRid, blobUrlEntry: request.blobUrlEntry, + url() { + return this.urlList[0]; + }, + currentUrl() { + return this.urlList[this.urlList.length - 1]; + }, }; }