Conflicts:
	Makefile.dryice.js
	build_support/boot.js
	build_support/mini_require.js
	lib/ace/edit_session.js
	package.json
	support/pilot
This commit is contained in:
Joe Walker 2011-02-19 23:38:07 +00:00
commit f332454b38
196 changed files with 51983 additions and 2086 deletions

View file

@ -35,53 +35,80 @@
*
* ***** END LICENSE BLOCK ***** */
(function() {
/**
* Define a module along with a payload
* @param module a name for the payload
* @param payload a function to call with (require, exports, module) params
*/
function define(module, payload) {
var _define = function(module, payload) {
if (typeof module !== 'string') {
console.error('dropping module because define wasn\'t a string.');
console.trace();
if (_define.original)
_define.original.apply(window, arguments);
else {
console.error('dropping module because define wasn\'t a string.');
console.trace();
}
return;
}
if (!define.modules) {
define.modules = {};
}
define.modules[module] = payload;
};
if (window.define) {
_define.original = window.define;
}
window.define = _define;
/**
* Get at functionality define()ed using the function above
*/
function require(module, callback) {
if (Array.isArray(module)) {
var _require = function(module, callback) {
if (Object.prototype.toString.call(module) === "[object Array]") {
var params = [];
module.forEach(function(m) {
params.push(define.lookup(m));
}, this);
for (var i = 0, l = module.length; i < l; ++i) {
var dep = lookup(module[i]);
if (!dep && _require.original)
return _require.original.apply(window, arguments);
params.push(dep);
};
if (callback) {
callback.apply(null, params);
}
}
if (typeof module === 'string') {
var payload = define.lookup(module);
var payload = lookup(module);
if (!payload && _require.original)
return _require.original.apply(window, arguments);
if (callback) {
callback();
}
return payload;
}
};
};
if (window.require) {
_require.original = window.require;
}
window.require = _require;
require.packaged = true;
/**
* Internal function to lookup moduleNames and resolve them by calling the
* definition function if needed.
*/
define.lookup = function(moduleName) {
var lookup = function(moduleName) {
var module = define.modules[moduleName];
if (module == null) {
console.error('Missing module: ' + moduleName);
@ -98,3 +125,6 @@ define.lookup = function(moduleName) {
return module;
};
})();