From 05163d9fb503777a5bb4056bba52ad745f4b52c0 Mon Sep 17 00:00:00 2001 From: Robin North Date: Fri, 26 Jan 2018 15:53:07 +0000 Subject: [PATCH 1/2] Stop dispatching extraneous `pjax:complete` events, correct typo --- lib/eval-script.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/eval-script.js b/lib/eval-script.js index 232090d..382e43e 100644 --- a/lib/eval-script.js +++ b/lib/eval-script.js @@ -1,6 +1,4 @@ module.exports = function(el) { - // console.log("going to execute script", el) - var code = (el.text || el.textContent || el.innerHTML || "") var src = (el.src || ""); var parent = el.parentNode || document.querySelector("head") || document.documentElement @@ -17,8 +15,7 @@ module.exports = function(el) { if (src != "") { script.src = src; - script.onload = function() { document.dispatchEvent((new Event("pjax:complete"))); } - script.async = false; // force asynchronous loading of peripheral js + script.async = false; // force synchronous loading of peripheral js } if (code != "") { -- 2.49.1 From 31e1e7e405e5b25431d6794e96a8ff1db5307eff Mon Sep 17 00:00:00 2001 From: Robin North Date: Fri, 26 Jan 2018 15:54:07 +0000 Subject: [PATCH 2/2] Enable test for `document.write` in eval'd scripts --- tests/lib/eval-scripts.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/lib/eval-scripts.js b/tests/lib/eval-scripts.js index 43113b9..183fb76 100644 --- a/tests/lib/eval-scripts.js +++ b/tests/lib/eval-scripts.js @@ -13,10 +13,11 @@ tape("test evalScript method", function(t) { evalScript(script) t.equal(document.body.className, "executed", "script has been properly executed") - // script.innerHTML = "document.write('failure')" - // var bodyText = document.body.text - // evalScript(script) - // t.equal(document.body.text, bodyText, "document.write hasn't been executed") + script.innerHTML = "document.write('failure')" + document.body.text = "document.write hasn't been executed" + var bodyText = document.body.text + evalScript(script) + t.equal(document.body.text, bodyText, "document.write hasn't been executed") t.end() }) -- 2.49.1