From 7735b35e213dc76d62e96ea15c7ce1a8ff9acfd8 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Sun, 21 Apr 2019 06:12:20 -0400 Subject: [PATCH] Fix uncaught rejected promise in assets.fetchText() Related issue: - https://github.com/uBlockOrigin/uBlock-issues/issues/534 Regression from https://github.com/gorhill/uBlock/commit/a52b07ff6ef6e6b16785e237178e1cd6f38a1833 --- src/js/assets.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/assets.js b/src/js/assets.js index e14725dec..286a43200 100644 --- a/src/js/assets.js +++ b/src/js/assets.js @@ -83,7 +83,7 @@ api.fetchText = function(url, onLoad, onError) { onError = onLoad; } - return new Promise((resolve, reject) => { + return new Promise(resolve => { // Start of executor const timeoutAfter = µBlock.hiddenSettings.assetFetchTimeout * 1000 || 30000; @@ -104,16 +104,16 @@ api.fetchText = function(url, onLoad, onError) { const onResolve = function(details) { if ( onLoad instanceof Function ) { - onLoad(details); + return onLoad(details); } resolve(details); }; const onReject = function(details) { if ( onError instanceof Function ) { - onError(details); + return onError(details); } - reject(details); + resolve(details); }; // https://github.com/gorhill/uMatrix/issues/15