v0.17.6

ModuleLoader · Aug 13, 2015 · 4ce001c · 4ce001c
1 parent ae60fff
commit 4ce001c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 23 deletions.
diff --git a/dist/es6-module-loader-dev.js b/dist/es6-module-loader-dev.js
diff --git a/dist/es6-module-loader-dev.js.map b/dist/es6-module-loader-dev.js.map
diff --git a/dist/es6-module-loader-dev.src.js b/dist/es6-module-loader-dev.src.js
@@ -1457,13 +1457,6 @@ SystemLoader.prototype.instantiate = function(load) {
   var fetchTextFromURL;
   if (typeof XMLHttpRequest != 'undefined') {
     fetchTextFromURL = function(url, fulfill, reject) {
-      // percent encode just '#' in urls
-      // according to https://github.com/jorendorff/js-loaders/blob/master/browser-loader.js#L238
-      // we should encode everything, but it breaks for servers that don't expect it
-      // like in (https://github.com/systemjs/systemjs/issues/168)
-      if (isBrowser)
-        url = url.replace(/#/g, '%23');
-
       var xhr = new XMLHttpRequest();
       var sameDomain = true;
       var doTimeout = false;
@@ -1503,7 +1496,8 @@ SystemLoader.prototype.instantiate = function(load) {
       };
       xhr.open("GET", url, true);
 
-      xhr.setRequestHeader('Accept', 'application/x-es-module */*');
+      if (xhr.setRequestHeader)
+        xhr.setRequestHeader('Accept', 'application/x-es-module */*');
 
       if (doTimeout)
         setTimeout(function() {

diff --git a/dist/es6-module-loader.js b/dist/es6-module-loader.js
diff --git a/dist/es6-module-loader.js.map b/dist/es6-module-loader.js.map
diff --git a/dist/es6-module-loader.src.js b/dist/es6-module-loader.src.js
@@ -1115,13 +1115,6 @@ SystemLoader.prototype.instantiate = function(load) {
   var fetchTextFromURL;
   if (typeof XMLHttpRequest != 'undefined') {
     fetchTextFromURL = function(url, fulfill, reject) {
-      // percent encode just '#' in urls
-      // according to https://github.com/jorendorff/js-loaders/blob/master/browser-loader.js#L238
-      // we should encode everything, but it breaks for servers that don't expect it
-      // like in (https://github.com/systemjs/systemjs/issues/168)
-      if (isBrowser)
-        url = url.replace(/#/g, '%23');
-
       var xhr = new XMLHttpRequest();
       var sameDomain = true;
       var doTimeout = false;
@@ -1161,7 +1154,8 @@ SystemLoader.prototype.instantiate = function(load) {
       };
       xhr.open("GET", url, true);
 
-      xhr.setRequestHeader('Accept', 'application/x-es-module */*');
+      if (xhr.setRequestHeader)
+        xhr.setRequestHeader('Accept', 'application/x-es-module */*');
 
       if (doTimeout)
         setTimeout(function() {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "es6-module-loader",
   "description": "An ES6 Module Loader shim",
-  "version": "0.17.5",
+  "version": "0.17.6",
   "homepage": "https://github.com/ModuleLoader/es6-module-loader",
   "author": {
     "name": "Guy Bedford, Luke Hoban, Addy Osmani",