fix a number of startup issues
This commit is contained in:
parent
78d4851576
commit
1b2a43afd5
1 changed files with 61 additions and 20 deletions
|
|
@ -1,10 +1,46 @@
|
||||||
|
/* ***** BEGIN LICENSE BLOCK *****
|
||||||
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
*
|
||||||
|
* The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
* the License. You may obtain a copy of the License at
|
||||||
|
* http://www.mozilla.org/MPL/
|
||||||
|
*
|
||||||
|
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
* for the specific language governing rights and limitations under the
|
||||||
|
* License.
|
||||||
|
*
|
||||||
|
* The Original Code is Ajax.org Code Editor (ACE).
|
||||||
|
*
|
||||||
|
* The Initial Developer of the Original Code is
|
||||||
|
* Ajax.org Services B.V.
|
||||||
|
* Portions created by the Initial Developer are Copyright (C) 2010
|
||||||
|
* the Initial Developer. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Contributor(s):
|
||||||
|
* Fabian Jakobs <fabian AT ajax DOT org>
|
||||||
|
*
|
||||||
|
* Alternatively, the contents of this file may be used under the terms of
|
||||||
|
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
* of those above. If you wish to allow use of your version of this file only
|
||||||
|
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
* use your version of this file under the terms of the MPL, indicate your
|
||||||
|
* decision by deleting the provisions above and replace them with the notice
|
||||||
|
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
* the provisions above, a recipient may use your version of this file under
|
||||||
|
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
*
|
||||||
|
* ***** END LICENSE BLOCK ***** */
|
||||||
|
|
||||||
function require(module, callback) {
|
function require(module, callback) {
|
||||||
|
|
||||||
if (Array.isArray(module)) {
|
if (Array.isArray(module)) {
|
||||||
var params = [];
|
var params = [];
|
||||||
module.forEach(function(m) {
|
module.forEach(function(m) {
|
||||||
params.push(require.modules[m]);
|
params.push(require._lookup(m));
|
||||||
}, this);
|
}, this);
|
||||||
|
|
||||||
if (callback) {
|
if (callback) {
|
||||||
|
|
@ -13,33 +49,38 @@ function require(module, callback) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (typeof module === 'string') {
|
if (typeof module === 'string') {
|
||||||
var payload = require.modules[module];
|
payload = require._lookup(module);
|
||||||
var module_name = module;
|
|
||||||
if (payload == null) {
|
|
||||||
console.error('Missing module: ' + module);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeof payload === 'function') {
|
|
||||||
var exports = {};
|
|
||||||
var module = {
|
|
||||||
id: '',
|
|
||||||
uri: ''
|
|
||||||
};
|
|
||||||
payload(require, exports, module);
|
|
||||||
payload = exports;
|
|
||||||
// cache the resulting module object for next time
|
|
||||||
require.modules[module_name] = payload;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (callback) {
|
if (callback) {
|
||||||
callback();
|
callback();
|
||||||
}
|
}
|
||||||
|
|
||||||
return payload;
|
return payload;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
require.modules = {};
|
require.modules = {};
|
||||||
|
|
||||||
|
require._lookup = function(moduleName) {
|
||||||
|
var payload = require.modules[moduleName];
|
||||||
|
var module_name = moduleName;
|
||||||
|
if (payload == null) {
|
||||||
|
console.error('Missing module: ' + moduleName);
|
||||||
|
console.trace();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof payload === 'function') {
|
||||||
|
var exports = {};
|
||||||
|
var module = {
|
||||||
|
id: moduleName,
|
||||||
|
uri: ''
|
||||||
|
};
|
||||||
|
payload(require, exports, module);
|
||||||
|
payload = exports;
|
||||||
|
// cache the resulting module object for next time
|
||||||
|
require.modules[module_name] = payload;
|
||||||
|
}
|
||||||
|
|
||||||
|
return payload;
|
||||||
|
};
|
||||||
|
|
||||||
function define(module, payload) {
|
function define(module, payload) {
|
||||||
if (typeof module !== 'string') {
|
if (typeof module !== 'string') {
|
||||||
console.error('dropping module because define wasn\'t munged.');
|
console.error('dropping module because define wasn\'t munged.');
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue