This commit is contained in:
Fabian Jakobs 2011-11-14 18:12:21 +01:00
commit d62c796785
8 changed files with 38 additions and 10 deletions

View file

@ -111,7 +111,10 @@ var _require = function(parentId, module, callback) {
if (global.require)
_require.original = global.require;
global.require = _require.bind(null, "");
global.require = function(module, callback) {
return _require("", module, callback);
};
global.require.packaged = true;
var normalizeModule = function(parentId, moduleName) {
@ -155,7 +158,12 @@ var lookup = function(parentId, moduleName) {
uri: '',
exports: exports
}
var returnValue = module(_require.bind(this, moduleName), exports, mod);
var req = function(module, callback) {
return _require(moduleName, module, callback);
};
var returnValue = module(req, exports, mod);
exports = returnValue || mod.exports;
// cache the resulting module object for next time

File diff suppressed because one or more lines are too long

View file

@ -11,7 +11,7 @@
Ace
version 0.2.0
commit 328dbc312f308810c2532ad27552df5b490ba9ab
commit 2d9382fb477a18c626fec8a801ee7ccb87fdbda7
-->

View file

@ -111,7 +111,10 @@ var _require = function(parentId, module, callback) {
if (global.require)
_require.original = global.require;
global.require = _require.bind(null, "");
global.require = function(module, callback) {
return _require("", module, callback);
};
global.require.packaged = true;
var normalizeModule = function(parentId, moduleName) {
@ -155,7 +158,12 @@ var lookup = function(parentId, moduleName) {
uri: '',
exports: exports
}
var returnValue = module(_require.bind(this, moduleName), exports, mod);
var req = function(module, callback) {
return _require(moduleName, module, callback);
};
var returnValue = module(req, exports, mod);
exports = returnValue || mod.exports;
// cache the resulting module object for next time

File diff suppressed because one or more lines are too long

View file

@ -62,12 +62,16 @@ var define = function(id, deps, factory) {
if (id.indexOf("text!") === 0)
return;
var req = function(deps, factory) {
return require(id, deps, factory);
}
require.modules[id] = {
factory: function() {
var module = {
exports: {}
};
var returnExports = factory(require.bind(null, id), module.exports, module);
var returnExports = factory(req, module.exports, module);
if (returnExports)
module.exports = returnExports;
return module;

View file

@ -62,12 +62,16 @@ var define = function(id, deps, factory) {
if (id.indexOf("text!") === 0)
return;
var req = function(deps, factory) {
return require(id, deps, factory);
}
require.modules[id] = {
factory: function() {
var module = {
exports: {}
};
var returnExports = factory(require.bind(null, id), module.exports, module);
var returnExports = factory(req, module.exports, module);
if (returnExports)
module.exports = returnExports;
return module;

View file

@ -62,12 +62,16 @@ var define = function(id, deps, factory) {
if (id.indexOf("text!") === 0)
return;
var req = function(deps, factory) {
return require(id, deps, factory);
}
require.modules[id] = {
factory: function() {
var module = {
exports: {}
};
var returnExports = factory(require.bind(null, id), module.exports, module);
var returnExports = factory(req, module.exports, module);
if (returnExports)
module.exports = returnExports;
return module;