package
This commit is contained in:
parent
d90cf5a31e
commit
633fbfdb31
12 changed files with 87 additions and 47 deletions
|
|
@ -126,16 +126,16 @@ var normalizeModule = function(parentId, moduleName) {
|
|||
// normalize relative requires
|
||||
if (moduleName.charAt(0) == ".") {
|
||||
var base = parentId.split("/").slice(0, -1).join("/");
|
||||
var moduleName = base + "/" + moduleName;
|
||||
moduleName = base + "/" + moduleName;
|
||||
|
||||
while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
|
||||
var previous = moduleName;
|
||||
var moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
|
||||
moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
|
||||
}
|
||||
}
|
||||
|
||||
return moduleName;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -147,7 +147,7 @@ var lookup = function(parentId, moduleName) {
|
|||
moduleName = normalizeModule(parentId, moduleName);
|
||||
|
||||
var module = define.modules[moduleName];
|
||||
if (module == null) {
|
||||
if (!module) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
@ -157,7 +157,7 @@ var lookup = function(parentId, moduleName) {
|
|||
id: moduleName,
|
||||
uri: '',
|
||||
exports: exports
|
||||
}
|
||||
};
|
||||
|
||||
var req = function(module, callback) {
|
||||
return _require(moduleName, module, callback);
|
||||
|
|
@ -8073,12 +8073,12 @@ exports.Mode = Mode;
|
|||
|
||||
define('ace/tokenizer', ['require', 'exports', 'module' ], function(require, exports, module) {
|
||||
|
||||
var Tokenizer = function(rules) {
|
||||
var Tokenizer = function(rules, flag) {
|
||||
flag = flag ? "g" + flag : "g";
|
||||
this.rules = rules;
|
||||
|
||||
this.regExps = {};
|
||||
this.matchMappings = {};
|
||||
var flag = flag ? "g" + flag : "g";
|
||||
for ( var key in this.rules) {
|
||||
var rule = this.rules[key];
|
||||
var state = rule;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue