|
@@ -107,17 +107,19 @@ function amdefine(module, requireFn) {
|
|
}
|
|
}
|
|
|
|
|
|
makeRequire = function (systemRequire, exports, module, relId) {
|
|
makeRequire = function (systemRequire, exports, module, relId) {
|
|
|
|
+ function requireInContext(depName) {
|
|
|
|
+ return stringRequire(systemRequire, exports, module, depName, relId);
|
|
|
|
+ }
|
|
|
|
+
|
|
function amdRequire(deps, callback) {
|
|
function amdRequire(deps, callback) {
|
|
if (typeof deps === 'string') {
|
|
if (typeof deps === 'string') {
|
|
//Synchronous, single module require('')
|
|
//Synchronous, single module require('')
|
|
- return stringRequire(systemRequire, exports, module, deps, relId);
|
|
|
|
|
|
+ return requireInContext(deps);
|
|
} else {
|
|
} else {
|
|
//Array of dependencies with a callback.
|
|
//Array of dependencies with a callback.
|
|
|
|
|
|
//Convert the dependencies to modules.
|
|
//Convert the dependencies to modules.
|
|
- deps = deps.map(function (depName) {
|
|
|
|
- return stringRequire(systemRequire, exports, module, depName, relId);
|
|
|
|
- });
|
|
|
|
|
|
+ deps = deps.map(requireInContext);
|
|
|
|
|
|
//Wait for next tick to call back the require call.
|
|
//Wait for next tick to call back the require call.
|
|
if (callback) {
|
|
if (callback) {
|