From e0f6001528abc9ccecc7368f94c3f23142aa367e Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Thu, 27 Jun 2013 16:31:12 -0700 Subject: [PATCH 1/3] Rename jspm-loader.js to loader.js --- jspm-loader.js => loader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename jspm-loader.js => loader.js (99%) diff --git a/jspm-loader.js b/loader.js similarity index 99% rename from jspm-loader.js rename to loader.js index 8d84950d..9da063a9 100644 --- a/jspm-loader.js +++ b/loader.js @@ -441,4 +441,4 @@ jspm.ondemand(resolvers); } } -})(); \ No newline at end of file +})(); From d2b29d26ca401090de51eb760bb5b2d01b15ff3a Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Thu, 27 Jun 2013 16:41:23 -0700 Subject: [PATCH 2/3] Update loader.js --- loader.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/loader.js b/loader.js index 9da063a9..53b87f57 100644 --- a/loader.js +++ b/loader.js @@ -95,7 +95,8 @@ else createLoader(); - function createLoader() { + window.createLoader = function() { + delete window.createLoader; // hooks without plugin logic var loaderHooks = { From 33a27c584f3ebc52ac97d0c90403546a2e39d21e Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Thu, 27 Jun 2013 16:56:59 -0700 Subject: [PATCH 3/3] Update loader.js --- loader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader.js b/loader.js index 53b87f57..ff0fca6d 100644 --- a/loader.js +++ b/loader.js @@ -185,7 +185,7 @@ } // then just use standard resolution - return System.resolve(name, options); + return System.resolve.call(this, name, options); }, fetch: function(url, callback, errback, options) { // do a fetch with a timeout @@ -391,7 +391,7 @@ return normalized; }, resolve: function(name, options) { - var resolved = loaderHooks.resolve(name, options); + var resolved = loaderHooks.resolve.call(this, name, options); if (options.metadata && options.metadata.plugin) { if (resolved.address) resolved.address = resolved.address.substr(0, resolved.address.length - 1);