From 1f689ae6dffc70da0f7fb7de05b9a35e6a4ca9e3 Mon Sep 17 00:00:00 2001 From: alexlamsl Date: Mon, 21 Nov 2016 16:54:40 +0800 Subject: [PATCH] fix error propagation from worker --- assets/master.js | 8 +++++++- assets/worker.js | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/assets/master.js b/assets/master.js index b5e06c0..bd672c3 100644 --- a/assets/master.js +++ b/assets/master.js @@ -22,7 +22,13 @@ worker.onmessage = function() { minify = function(value, options, callback, errorback) { worker.onmessage = function(event) { - (typeof event.data === 'string' ? callback : errorback)(event.data); + var data = event.data; + if (data.error) { + errorback(data.error); + } + else { + callback(data); + } }; worker.postMessage({ value: value, diff --git a/assets/worker.js b/assets/worker.js index 6d12eb4..c33eb66 100644 --- a/assets/worker.js +++ b/assets/worker.js @@ -12,7 +12,9 @@ postMessage(minify(event.data.value, options)); } catch (err) { - postMessage(err); + postMessage({ + error: err + '' + }); } }); postMessage(null); -- 2.34.1