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

package

Browse source
This commit is contained in:
Fabian Jakobs 2011-12-05 18:53:44 +01:00
commit 633fbfdb31
12 changed files with 87 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

14
build/demo/kitchen-sink/kitchen-sink-uncompressed.js
View file

@ -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);
@ -6168,12 +6168,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;

2
build/demo/kitchen-sink/kitchen-sink.js
View file

File diff suppressed because one or more lines are too long

2
build/editor.html
View file

@ -28,7 +28,7 @@
}
}</pre>
<script src="src/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="src/ace-uncompressed.js" type="text/javascript" charset="utf-8"></script>
<script src="src/theme-twilight.js" type="text/javascript" charset="utf-8"></script>
<script src="src/mode-javascript.js" type="text/javascript" charset="utf-8"></script>
<script>

2
build/kitchen-sink.html
View file

@ -11,7 +11,7 @@
Ace
version 0.2.0
commit e0c00a1840f81e605fbed3350bf4c59e6af9492c
commit 1b58db895c6779c2492b4f5735677a87695bb422
-->

14
build/src/ace-uncompressed.js
View file

@ -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;

2
build/src/ace.js
View file

File diff suppressed because one or more lines are too long

4
build/textarea/editor.html
View file

@ -81,10 +81,10 @@ function inject() {
load.scripts = {};
window.__ace_shadowed_load__ = load;
load('ace.js', 'text!ace/css/editor.css', function() {
load('ace-uncompressed.js', 'text!ace/css/editor.css', function() {
var ace = window.__ace_shadowed__;
ace.options.mode = "javascript";
var Event = ace.require("lib/ace/event");
var Event = ace.require("ace/lib/event");
var areas = document.getElementsByTagName("textarea");
for (var i = 0; i < areas.length; i++) {
Event.addListener(areas[i], "click", function(e) {

82
build/textarea/src/ace-uncompressed.js
View file

@ -60,57 +60,94 @@ var _define = function(module, deps, payload) {
if (!_define.modules)
_define.modules = {};
_define.modules[module] = payload;
};
/**
* Get at functionality __ace_shadowed__.define()ed using the function above
*/
var _require = function(module, callback) {
var _require = function(parentId, module, callback) {
if (Object.prototype.toString.call(module) === "[object Array]") {
var params = [];
for (var i = 0, l = module.length; i < l; ++i) {
var dep = lookup(module[i]);
var dep = lookup(parentId, module[i]);
if (!dep && _require.original)
return _require.original.apply(window, arguments);
params.push(dep);
};
}
if (callback) {
callback.apply(null, params);
}
}
if (typeof module === 'string') {
var payload = lookup(module);
else if (typeof module === 'string') {
var payload = lookup(parentId, module);
if (!payload && _require.original)
return _require.original.apply(window, arguments);
if (callback) {
callback();
}
return payload;
};
}
}
else {
if (_require.original)
return _require.original.apply(window, arguments);
}
};
_require.packaged = true;
_require.noWorker = true;
var normalizeModule = function(parentId, moduleName) {
// normalize plugin requires
if (moduleName.indexOf("!") !== -1) {
var chunks = moduleName.split("!");
return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
}
// normalize relative requires
if (moduleName.charAt(0) == ".") {
var base = parentId.split("/").slice(0, -1).join("/");
moduleName = base + "/" + moduleName;
while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
var previous = moduleName;
moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
}
}
return moduleName;
};
/**
* Internal function to lookup moduleNames and resolve them by calling the
* definition function if needed.
*/
var lookup = function(moduleName) {
var lookup = function(parentId, moduleName) {
moduleName = normalizeModule(parentId, moduleName);
var module = _define.modules[moduleName];
if (module == null) {
console.error('Missing module: ' + moduleName);
if (!module) {
return null;
}
if (typeof module === 'function') {
var exports = {};
module(_require, exports, { id: moduleName, uri: '' });
var mod = {
id: moduleName,
uri: '',
exports: exports
};
var req = function(module, callback) {
return _require(moduleName, module, callback);
};
var returnValue = module(req, exports, mod);
exports = returnValue || mod.exports;
// cache the resulting module object for next time
_define.modules[moduleName] = exports;
return exports;
@ -119,12 +156,15 @@ var lookup = function(moduleName) {
return module;
};
/**
* Expose as "shadowed" object to the outside world.
*/
window.__ace_shadowed__ = {
require: _require,
require: function(module, callback) {
return _require("", module, callback);
},
define: _define
};
@ -8027,12 +8067,12 @@ exports.Mode = Mode;
__ace_shadowed__.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;
@ -14241,7 +14281,7 @@ window.__ace_shadowed__.edit = function(el) {
});
el.env = env;
return editor;
}
};
/**
@ -14437,13 +14477,13 @@ window.__ace_shadowed__.transformTextarea = function(element) {
editorDiv.appendChild(settingOpener);
// Create the API.
var api = setupApi(editor, editorDiv, settingDiv, ace, options)
var api = setupApi(editor, editorDiv, settingDiv, ace, options);
// Create the setting's panel.
setupSettingPanel(settingDiv, settingOpener, api, options);
return api;
}
};
function setupApi(editor, editorDiv, settingDiv, ace, options) {
var session = editor.getSession();

2
build/textarea/src/ace.js
View file

File diff suppressed because one or more lines are too long

6
build_support/boot_textarea.js
View file

@ -70,7 +70,7 @@ window.__ace_shadowed__.edit = function(el) {
});
el.env = env;
return editor;
}
};
/**
@ -266,13 +266,13 @@ window.__ace_shadowed__.transformTextarea = function(element) {
editorDiv.appendChild(settingOpener);
// Create the API.
var api = setupApi(editor, editorDiv, settingDiv, ace, options)
var api = setupApi(editor, editorDiv, settingDiv, ace, options);
// Create the setting's panel.
setupSettingPanel(settingDiv, settingOpener, api, options);
return api;
}
};
function setupApi(editor, editorDiv, settingDiv, ace, options) {
var session = editor.getSession();

2
build_support/editor.html
View file

@ -28,7 +28,7 @@
}
}</pre>
<script src="src/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="src/ace-uncompressed.js" type="text/javascript" charset="utf-8"></script>
<script src="src/theme-twilight.js" type="text/javascript" charset="utf-8"></script>
<script src="src/mode-javascript.js" type="text/javascript" charset="utf-8"></script>
<script>

2
build_support/editor_textarea.html
View file

@ -84,7 +84,7 @@ function inject() {
load('ace.js', 'text!ace/css/editor.css', function() {
var ace = window.__ace_shadowed__;
ace.options.mode = "javascript";
var Event = ace.require("lib/ace/event");
var Event = ace.require("ace/lib/event");
var areas = document.getElementsByTagName("textarea");
for (var i = 0; i < areas.length; i++) {
Event.addListener(areas[i], "click", function(e) {