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

resolve collision with existing requireJS on the page

Browse source
This commit is contained in:
Fabian Jakobs 2011-08-18 14:10:51 +02:00
commit 1e8a366cd5
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
build_support/mini_require.js
View file

@ -47,12 +47,6 @@ var global = (function() {
return this; return this;
})(); })();
// if we find an existing require function use it.
if (global.require && global.define) {
require.packaged = true;
return;
}
var _define = function(module, deps, payload) { var _define = function(module, deps, payload) {
if (typeof module !== 'string') { if (typeof module !== 'string') {
if (_define.original) if (_define.original)
@ -110,12 +104,13 @@ var _require = function(module, callback) {
return _require.original.apply(window, arguments); return _require.original.apply(window, arguments);
} }
}; };
_require.packaged = true;
if (global.require) if (global.require)
_require.original = global.require; _require.original = global.require;
global.require = _require; global.require = _require;
require.packaged = true;
/** /**
* Internal function to lookup moduleNames and resolve them by calling the * Internal function to lookup moduleNames and resolve them by calling the