Browse Source

refactor: code cosmetics

tophf 2 years ago
parent
commit
e9f2e59e1a
2 changed files with 8 additions and 6 deletions
  1. 1 1
      src/background/utils/requests.js
  2. 7 5
      src/injected/content/requests.js

+ 1 - 1
src/background/utils/requests.js

@@ -108,7 +108,7 @@ function xhrCallbackWrapper(req, events, blobbed, chunked, isJson) {
     const readyState4 = xhr.readyState === 4;
     if (!shouldNotify && !isEnd
     // Firefox duplicates readystatechange for state=4 randomly, #1862
-    || sentReadyState4 && (tmp = readyState4 && type === 'readystatechange')) {
+    || sentReadyState4 && (tmp = (readyState4 && type === 'readystatechange'))) {
       return;
     }
     if (tmp) {

+ 7 - 5
src/injected/content/requests.js

@@ -70,11 +70,13 @@ addBackgroundHandlers({
         processChunk(req, response);
         response = req[CHUNKS];
         delete req[CHUNKS];
-        if (req[kXhrType]) {
-          response = req[kXhrType] === 'blob'
-            ? new SafeBlob([response], { type: msg.contentType })
-            : response::getTypedArrayBuffer();
-        } // else: sending text chunks as-is to avoid memory overflow due to frequent concatenation
+        if (req[kXhrType] === 'blob') {
+          response = new SafeBlob([response], { type: msg.contentType });
+        } else if (req[kXhrType]) {
+          response = response::getTypedArrayBuffer();
+        } else {
+          // sending text chunks as-is to avoid memory overflow due to concatenation
+        }
       }
       data[kResponse] = response;
     }