From 3bec8b0311344abe42752a679e00b7c77f024650 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 16 Nov 2014 01:41:16 -0800 Subject: [PATCH 1/2] Prefer module global reference rather than window --- lib/6to5/browser.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/6to5/browser.js b/lib/6to5/browser.js index 65dc3f64be..fba39705f1 100644 --- a/lib/6to5/browser.js +++ b/lib/6to5/browser.js @@ -12,7 +12,7 @@ transform.load = function (url, callback, opts, hold) { opts = opts || {}; opts.filename = opts.filename || url; - var xhr = window.ActiveXObject ? new window.ActiveXObject("Microsoft.XMLHTTP") : new window.XMLHttpRequest(); + var xhr = global.ActiveXObject ? new global.ActiveXObject("Microsoft.XMLHTTP") : new global.XMLHttpRequest(); xhr.open("GET", url, true); if ("overrideMimeType" in xhr) xhr.overrideMimeType("text/plain"); @@ -60,7 +60,7 @@ var runScripts = function () { } }; - var _scripts = window.document.getElementsByTagName("script"); + var _scripts = global.document.getElementsByTagName("script"); for (var i in _scripts) { var _script = _scripts[i]; if (types.indexOf(_script.type) >= 0) scripts.push(_script); @@ -73,8 +73,8 @@ var runScripts = function () { exec(); }; -if (window.addEventListener) { - window.addEventListener("DOMContentLoaded", runScripts, false); +if (global.addEventListener) { + global.addEventListener("DOMContentLoaded", runScripts, false); } else { - window.attachEvent("onload", runScripts); + global.attachEvent("onload", runScripts); } From 0c57a00fdb05e08277d83fc29bb15d4c1398738f Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 16 Nov 2014 01:41:56 -0800 Subject: [PATCH 2/2] Check if attachEvent is defined --- lib/6to5/browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/6to5/browser.js b/lib/6to5/browser.js index fba39705f1..a8e946c859 100644 --- a/lib/6to5/browser.js +++ b/lib/6to5/browser.js @@ -75,6 +75,6 @@ var runScripts = function () { if (global.addEventListener) { global.addEventListener("DOMContentLoaded", runScripts, false); -} else { +} else if (global.attachEvent) { global.attachEvent("onload", runScripts); }