Merge branch 'master' of github.com:ajaxorg/ace

Conflicts:
	build_support/mini_require.js
This commit is contained in:
Fabian Jakobs 2011-01-31 14:23:22 +01:00
commit 43f73bf25d

View file

@ -47,9 +47,9 @@ function define(module, payload) {
return; return;
} }
if (!define.modules) { if (!define.modules)
define.modules = {}; define.modules = {};
}
define.modules[module] = payload; define.modules[module] = payload;
} }
@ -57,12 +57,11 @@ function define(module, payload) {
* Get at functionality define()ed using the function above * Get at functionality define()ed using the function above
*/ */
function require(module, callback) { function require(module, callback) {
if (Array.isArray(module)) { if (Object.prototype.toString.call(module) === "[object Array]") {
var params = []; var params = [];
module.forEach(function(m) { for (var i = 0, l = module.length; i < l; ++i) {
params.push(define.lookup(m)); params.push(require._lookup(module[i]));
}, this); };
if (callback) { if (callback) {
callback.apply(null, params); callback.apply(null, params);
} }