From 049485e495e0d1ce0d54694d92500ecdeadb1ef0 Mon Sep 17 00:00:00 2001 From: hackademix Date: Sun, 3 Nov 2019 13:29:34 +0100 Subject: Remove loop around XHR. --- src/lib/SyncMessage.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/lib/SyncMessage.js b/src/lib/SyncMessage.js index 217cb24..5880cdb 100644 --- a/src/lib/SyncMessage.js +++ b/src/lib/SyncMessage.js @@ -188,15 +188,13 @@ // on Firefox we first need to send an async message telling the // background script about the tab ID, which does not get sent // with "privileged" XHR - let result, done = false; + let result; browser.runtime.sendMessage( {__syncMessage__: {id: msgId, payload: msg}} ).then(r => { - done = true; result = r; if (callback) callback(r); }).catch(e => { - done = true; throw e; }); @@ -209,14 +207,12 @@ let suspend = () => { if (suspended) return; suspended = true; - while(!done) { - try { - let r = new XMLHttpRequest(); - r.open("GET", suspendURL, false); - r.send(null); - } catch (e) { - console.error(e); - } + try { + let r = new XMLHttpRequest(); + r.open("GET", suspendURL, false); + r.send(null); + } catch (e) { + console.error(e); } suspended = false; }; -- cgit v1.2.3