From 5f4ae3231f7a758bf3b77383bd18f66636e19157 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Thu, 25 Jul 2019 18:12:06 -0700 Subject: [PATCH] Remove $.globalEval and simplify passing of data to/from scripts run in global context. --- src/platform/$.coffee | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/platform/$.coffee b/src/platform/$.coffee index 4c309ee5bc..d2da191a6e 100644 --- a/src/platform/$.coffee +++ b/src/platform/$.coffee @@ -416,19 +416,19 @@ $.queueTask = do -> taskQueue.push arguments setTimeout execTask, 0 -$.globalEval = (code, data) -> - script = $.el 'script', - textContent: code - $.extend script.dataset, data if data - $.add (d.head or doc), script - $.rm script - $.global = (fn, data) -> if doc - $.globalEval "(#{fn})();", data + script = $.el 'script', + textContent: "(#{fn}).call(document.currentScript.dataset);" + $.extend script.dataset, data if data + $.add (d.head or doc), script + $.rm script + script.dataset else # XXX dwb - fn() + try + fn.call(data) + data $.bytesToString = (size) -> unit = 0 # Bytes