archive-gh-me/systemjs
1
0
Fork 0
mirror of https://github.com/systemjs/systemjs.git synced 2026-02-01 15:59:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:jspm/jspm-loader

Browse Source
This commit is contained in:
guybedford 2013-06-30 11:58:03 -07:00
commit 21159b8338
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jspm-loader.js → loader.js
View File

@ -95,7 +95,8 @@
else
createLoader();
function createLoader() {
window.createLoader = function() {
delete window.createLoader;
// hooks without plugin logic
var loaderHooks = {
@ -184,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
@ -390,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);
@ -441,4 +442,4 @@
jspm.ondemand(resolvers);
}
}
})();
})();