archive-gh-me/systemjs
1
0
Fork 0
mirror of https://github.com/systemjs/systemjs.git synced 2026-01-25 14:57:38 +00:00
Code Issues Projects Releases Wiki Activity

backwards compat for #1008

Browse Source
This commit is contained in:
guybedford 2016-01-06 19:10:44 +02:00
parent d32a45dad2
commit b6013907eb
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/core.js
View File

@ -138,7 +138,7 @@ hook('normalize', function(normalize) {
if (name.match(absURLRegEx)) {
// defaultJSExtensions backwards compatibility
if (this.defaultJSExtensions && name.substr(name.length - 3, 3) != '.js')
if (this.defaultJSExtensions && name.substr(name.length - 3, 3) != '.js' && !this.defined[name])
name += '.js';
return name;
}
@ -146,16 +146,18 @@ hook('normalize', function(normalize) {
// applyPaths implementation provided from ModuleLoader system.js source
name = applyPaths(this.paths, name) || name;
// defaultJSExtensions backwards compatibility
if (this.defaultJSExtensions && name.substr(name.length - 3, 3) != '.js')
name += '.js';
// ./x, /x -> page-relative
if (name[0] == '.' || name[0] == '/')
return new URL(name, baseURIObj).href;
name = new URL(name, baseURIObj).href;
// x -> baseURL-relative
else
return new URL(name, getBaseURLObj.call(this)).href;
name = new URL(name, getBaseURLObj.call(this)).href;
// defaultJSExtensions backwards compatibility
if (this.defaultJSExtensions && name.substr(name.length - 3, 3) != '.js' && !this.defined[name])
name += '.js';
return name;
};
});