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

add location relative adjustment

Browse Source
This commit is contained in:
guybedford 2013-08-19 10:10:09 +02:00
parent d361ac8470
commit b8278c942f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
loader.js
View File

@ -195,6 +195,9 @@
var jspm = global.jspm = new Loader({
normalize: function(name, referer) {
name = name.trim();
// allow inline shim configuration
var inlineShim;
if (name.indexOf('|') != -1) {
@ -226,6 +229,10 @@
if (name.substr(0, 1) != '#') {
// treat an initial '/' as location relative
if (name.substr(0, 1) == '/')
name = name.substr(1);
// do standard normalization (resolve relative module name)
name = System.normalize(name, referer);
@ -450,10 +457,10 @@
// CommonJS
// require('...') || exports[''] = ... || exports.asd = ... || module.exports = ...
if (source.match(cjsExportsRegEx) || source.match(cjsRequireRegEx)) {
// NB replace the require statements with the normalized dependency requires
var match;
while (match = cjsRequireRegEx.exec(source))
_imports.push(match[2] || match[3]);
return {
imports: _imports, // clone the array as we still need it
execute: function(deps) {
@ -576,7 +583,7 @@
// commonjs require
else if (typeof names == 'string')
return jspm.get(jspm.normalize(names, referer));
return jspm.get(names);
else
throw 'Invalid require';
@ -591,7 +598,7 @@
jspm: 'https://github.jspm.io/jspm/registry@master'
},
map: {
plugin: 'github:jspm/plugins'
plugin: 'github:jspm/plugins@0.0.4'
}
});