From ec59a626f298a44ea487e436899fd21e79636efd Mon Sep 17 00:00:00 2001 From: Philipp von Weitershausen Date: Wed, 5 Sep 2012 00:09:18 -0700 Subject: [PATCH 1/2] Fix #2534: Don't pass a string argument to the XMLHttpRequest constructor. --- src/browser.coffee | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/browser.coffee b/src/browser.coffee index 5ed0bea87a..6601c45c4b 100644 --- a/src/browser.coffee +++ b/src/browser.coffee @@ -18,7 +18,10 @@ return unless window? # Load a remote script from the current domain via XHR. CoffeeScript.load = (url, callback) -> - xhr = new (window.ActiveXObject or XMLHttpRequest)('Microsoft.XMLHTTP') + if window.ActiveXObject + xhr = new window.ActiveXObject('Microsoft.XMLHTTP') + else + xhr = new XMLHttpRequest() xhr.open 'GET', url, true xhr.overrideMimeType 'text/plain' if 'overrideMimeType' of xhr xhr.onreadystatechange = -> From 78423e9a14494532a195bc3ff50e4148f2e3a942 Mon Sep 17 00:00:00 2001 From: Philipp von Weitershausen Date: Fri, 7 Sep 2012 12:53:37 -0700 Subject: [PATCH 2/2] Fix #2534: Address @jashkenas review comment. --- src/browser.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/browser.coffee b/src/browser.coffee index 6601c45c4b..471d6e3e74 100644 --- a/src/browser.coffee +++ b/src/browser.coffee @@ -18,10 +18,10 @@ return unless window? # Load a remote script from the current domain via XHR. CoffeeScript.load = (url, callback) -> - if window.ActiveXObject - xhr = new window.ActiveXObject('Microsoft.XMLHTTP') + xhr = if window.ActiveXObject + new window.ActiveXObject('Microsoft.XMLHTTP') else - xhr = new XMLHttpRequest() + new XMLHttpRequest() xhr.open 'GET', url, true xhr.overrideMimeType 'text/plain' if 'overrideMimeType' of xhr xhr.onreadystatechange = ->