浏览代码

refactored fetchResource function

Former-commit-id: 95522789e8e9247ed25d38754be69a6ac4d3dd25
Gildas 6 年之前
父节点
当前提交
fd0cd5b0e1
共有 1 个文件被更改,包括 5 次插入8 次删除
  1. 5 8
      extension/lib/fetch/bg/fetch.js

+ 5 - 8
extension/lib/fetch/bg/fetch.js

@@ -44,10 +44,6 @@ singlefile.extension.lib.fetch.bg.resources = (() => {
 		}
 	}
 
-	function getResponse(xhrRequest) {
-		return { array: Array.from(new Uint8Array(xhrRequest.response)) };
-	}
-
 	async function fetchResource(url) {
 		return new Promise((resolve, reject) => {
 			const xhrRequest = new XMLHttpRequest();
@@ -56,10 +52,11 @@ singlefile.extension.lib.fetch.bg.resources = (() => {
 			xhrRequest.onerror = event => reject(new Error(event.detail));
 			xhrRequest.onreadystatechange = () => {
 				if (xhrRequest.readyState == XMLHttpRequest.DONE) {
-					const response = getResponse(xhrRequest);
-					response.headers = { "content-type": xhrRequest.getResponseHeader("Content-Type") };
-					response.status = xhrRequest.status;
-					resolve(response);
+					resolve({
+						array: Array.from(new Uint8Array(xhrRequest.response)),
+						headers: { "content-type": xhrRequest.getResponseHeader("Content-Type") },
+						status: xhrRequest.status
+					});
 				}
 			};
 			xhrRequest.open("GET", url, true);