iLoveElysia/pjax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

Merge pull request #118 from MoOx/fix/external-scripts-events

Browse Source 
Fix external scripts events
This commit was merged in pull request #118.
This commit is contained in:
BehindTheMath
2018-01-31 16:46:28 -05:00
committed by GitHub
parent 63bc2af226 31e1e7e405
commit 57aed828ac
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/eval-script.js
View File

@@ -1,6 +1,4 @@
module.exports = function(el) { module.exports = function(el) {
// console.log("going to execute script", el)
var code = (el.text || el.textContent || el.innerHTML || "") var code = (el.text || el.textContent || el.innerHTML || "")
var src = (el.src || ""); var src = (el.src || "");
var parent = el.parentNode || document.querySelector("head") || document.documentElement var parent = el.parentNode || document.querySelector("head") || document.documentElement
@@ -17,8 +15,7 @@ module.exports = function(el) {
if (src != "") { if (src != "") {
script.src = src; script.src = src;
script.onload = function() { document.dispatchEvent((new Event("pjax:complete"))); } script.async = false; // force synchronous loading of peripheral js
script.async = false; // force asynchronous loading of peripheral js
} }
if (code != "") { if (code != "") {

9
tests/lib/eval-scripts.js
View File

@@ -13,10 +13,11 @@ tape("test evalScript method", function(t) {
evalScript(script) evalScript(script)
t.equal(document.body.className, "executed", "script has been properly executed") t.equal(document.body.className, "executed", "script has been properly executed")
// script.innerHTML = "document.write('failure')" script.innerHTML = "document.write('failure')"
// var bodyText = document.body.text document.body.text = "document.write hasn't been executed"
// evalScript(script) var bodyText = document.body.text
// t.equal(document.body.text, bodyText, "document.write hasn't been executed") evalScript(script)
t.equal(document.body.text, bodyText, "document.write hasn't been executed")
t.end() t.end()
}) })