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

use proper AMD style

Browse source
This commit is contained in:
Fabian Jakobs 2011-02-21 12:41:48 +01:00
commit 8c06c538ee
3 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
build_support/mini_require.js
View file

@ -43,7 +43,12 @@
(function() { (function() {
var _define = function(module, payload) { if (window.require) {
require.packaged = true;
return;
}
var _define = function(module, deps, payload) {
if (typeof module !== 'string') { if (typeof module !== 'string') {
if (_define.original) if (_define.original)
_define.original.apply(window, arguments); _define.original.apply(window, arguments);
@ -76,13 +81,12 @@ var _require = function(module, callback) {
if (!dep && _require.original) if (!dep && _require.original)
return _require.original.apply(window, arguments); return _require.original.apply(window, arguments);
params.push(dep); params.push(dep);
}; }
if (callback) { if (callback) {
callback.apply(null, params); callback.apply(null, params);
} }
} }
else if (typeof module === 'string') {
if (typeof module === 'string') {
var payload = lookup(module); var payload = lookup(module);
if (!payload && _require.original) if (!payload && _require.original)
return _require.original.apply(window, arguments); return _require.original.apply(window, arguments);
@ -92,8 +96,12 @@ var _require = function(module, callback) {
} }
return payload; return payload;
}; }
} else {
if (_require.original)
return _require.original.apply(window, arguments);
}
};
if (window.require) if (window.require)
_require.original = window.require; _require.original = window.require;

2
build_support/mini_require_textarea.js
View file

@ -44,7 +44,7 @@
(function() { (function() {
var _define = function(module, payload) { var _define = function(module, deps, payload) {
if (typeof module !== 'string') { if (typeof module !== 'string') {
if (_define.original) if (_define.original)
_define.original.apply(window, arguments); _define.original.apply(window, arguments);

7
lib/ace/worker/worker.js
View file

@ -30,11 +30,14 @@ var require = function(id) {
require.modules = {}; require.modules = {};
require.tlns = {}; require.tlns = {};
var define = function(id, factory) { var define = function(id, deps, factory) {
if (!factory) { if (arguments.length == 2) {
factory = deps;
} else if (arguments.length == 1) {
factory = id; factory = id;
id = require.id; id = require.id;
} }
if (id.indexOf("text!") === 0) if (id.indexOf("text!") === 0)
return; return;