jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	build_support/mini_require.js
	support/cockpit
	support/pilot
This commit is contained in:
Joe Walker 2011-03-17 12:54:50 +00:00
commit a6aa2ec6ee
111 changed files with 7507 additions and 3756 deletions
Download patch file Download diff file Expand all files Collapse all files

37
build_support/mini_require.js
View file

@ -35,15 +35,20 @@
*
* ***** 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
*/
var _define = function(module, payload) {
(function() {
if (window.require) {
require.packaged = true;
return;
}
var _define = function(module, deps, payload) {
if (typeof module !== 'string') {
if (_define.original)
_define.original.apply(window, arguments);
@ -54,15 +59,16 @@ var _define = function(module, payload) {
return;
}
if (!define.modules) {
if (arguments.length == 2)
payload = deps;
if (!define.modules)
define.modules = {};
}
define.modules[module] = payload;
};
if (window.define) {
if (window.define)
_define.original = window.define;
}
window.define = _define;
@ -78,13 +84,12 @@ var _require = function(module, callback) {
if (!dep && _require.original)
return _require.original.apply(window, arguments);
params.push(dep);
};
}
if (callback) {
callback.apply(null, params);
}
}
if (typeof module === 'string') {
else if (typeof module === 'string') {
var payload = lookup(module);
if (!payload && _require.original)
return _require.original.apply(window, arguments);
@ -94,12 +99,15 @@ var _require = function(module, callback) {
}
return payload;
};
}
else {
if (_require.original)
return _require.original.apply(window, arguments);
}
};
if (window.require) {
if (window.require)
_require.original = window.require;
}
window.require = _require;
require.packaged = true;
@ -126,5 +134,4 @@ var lookup = function(moduleName) {
return module;
};
})();